Skip to content

Commit 754b2ff

Browse files
committed
Merge branch 'master' into v7
2 parents 9b67e9a + ffd94a9 commit 754b2ff

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

conf/base.conf.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ exports.config = {
33
key: process.env.BROWSERSTACK_ACCESS_KEY || 'BROWSERSTACK_ACCESS_KEY',
44

55
updateJob: false,
6-
specs: [
7-
'./tests/specs/test.js'
8-
],
6+
specs: ['./tests/specs/test.js'],
97
exclude: [],
108

119
logLevel: 'warn',
@@ -26,6 +24,6 @@ exports.config = {
2624
framework: 'mocha',
2725
mochaOpts: {
2826
ui: 'bdd',
29-
timeout: 60000
30-
}
31-
}
27+
timeout: 60000,
28+
},
29+
};

package-lock.json

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

0 commit comments

Comments
 (0)