Skip to content

Commit 9452009

Browse files
Merge pull request #362 from wearebraid/release/2.5.0
Release/2.5.0
2 parents fd39c19 + 6c316f1 commit 9452009

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+4056
-321
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ coverage
44
.DS_Store
55
.vscode
66
.idea
7+
test/cypress/videos
8+
test/cypress/screenshots

.travis.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
language: node_js
22
node_js:
3-
- "node"
4-
- "11"
3+
- "12"
4+
cache:
5+
npm: true
6+
directories:
7+
- ~/.cache
8+
install:
9+
- npm ci
10+
script:
11+
- npm run test
12+
- npm run cypress:ci

build/cypress.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
pids=( $! )
3+
4+
# Start the nuxt server
5+
npm run dev &
6+
pids+=( $! )
7+
8+
# Run the cypress tests
9+
echo "⏳ Waiting for server to boot..."
10+
npx wait-on http://localhost:7872
11+
echo "✅ Server booted."
12+
echo "Running cypress tests..."
13+
14+
npx cypress run --record --key $CYPRESS_KEY
15+
# Store the exit code for later
16+
status=$?
17+
18+
# Shutdown all background jobs
19+
for pid in ${pids[@]}; do
20+
echo "Shutting down process $pid"
21+
kill $pid
22+
done
23+
# Shutdown with the status of our tests
24+
exit $status

cypress.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"projectId": "asfe8p",
3+
"fixturesFolder": "test/cypress/fixtures",
4+
"integrationFolder": "test/cypress/integration",
5+
"screenshotsFolder": "test/cypress/screenshots",
6+
"pluginsFolder": "test/cypress/plugins",
7+
"videosFolder": "test/cypress/videos",
8+
"supportFile": "test/cypress/support"
9+
}

cypress/plugins/index.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/// <reference types="cypress" />
2+
// ***********************************************************
3+
// This example plugins/index.js can be used to load plugins
4+
//
5+
// You can change the location of this file or turn off loading
6+
// the plugins file with the 'pluginsFile' configuration option.
7+
//
8+
// You can read more here:
9+
// https://on.cypress.io/plugins-guide
10+
// ***********************************************************
11+
12+
// This function is called when a project is opened or re-opened (e.g. due to
13+
// the project's config changing)
14+
15+
/**
16+
* @type {Cypress.PluginConfig}
17+
*/
18+
module.exports = (on, config) => {
19+
// `on` is used to hook into various events Cypress emits
20+
// `config` is the resolved Cypress config
21+
}

dist/formulate.esm.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/formulate.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/formulate.umd.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/snow.css

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,9 @@
212212
.formulate-input[data-classification='button'] button[disabled] {
213213
background-color: #cecece;
214214
border-color: #cecece; }
215+
.formulate-input[data-classification='button'] button[disabled]:active {
216+
background-color: #cecece;
217+
border-color: #cecece; }
215218
.formulate-input[data-classification='button'] button[data-ghost] {
216219
color: #41b883;
217220
background-color: transparent;
@@ -355,6 +358,9 @@
355358
transition: background-color .2s;
356359
overflow: hidden;
357360
text-indent: -1000px; }
361+
.formulate-input[data-classification='group'] [data-is-repeatable] .formulate-input-group-repeatable-remove[data-disabled] {
362+
opacity: .2;
363+
pointer-events: none; }
358364
.formulate-input[data-classification='group'] [data-is-repeatable] .formulate-input-group-repeatable-remove::before, .formulate-input[data-classification='group'] [data-is-repeatable] .formulate-input-group-repeatable-remove::after {
359365
content: '';
360366
position: absolute;
@@ -435,6 +441,26 @@
435441
list-style-type: none;
436442
margin: 0;
437443
padding: 0; }
444+
.formulate-input[data-classification="file"] .formulate-files .formulate-file-add {
445+
appearance: none;
446+
display: block;
447+
min-width: 75px;
448+
border: 1px solid #41b883;
449+
color: #41b883;
450+
padding: 5px;
451+
border-radius: 5px;
452+
text-align: center;
453+
position: relative;
454+
font-size: 13px;
455+
background-color: transparent;
456+
cursor: pointer;
457+
margin: .5em 0; }
458+
.formulate-input[data-classification="file"] .formulate-files .formulate-file-add input {
459+
position: absolute;
460+
display: block;
461+
cursor: pointer; }
462+
.formulate-input[data-classification="file"] .formulate-files .formulate-file-add input::-webkit-file-upload-button {
463+
display: none; }
438464
.formulate-input[data-classification="file"] .formulate-files .formulate-file-progress {
439465
background-color: #cecece;
440466
height: .3em;

dist/snow.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)