Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

chore(test): move custom/smoke_spec off of the control flow #5026

Merged
merged 2 commits into from
Nov 10, 2018
Merged

chore(test): move custom/smoke_spec off of the control flow #5026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c719dc
chore(test): move custom/smoke_spec off of the control flow
CrispusDH Nov 9, 2018
7689205
Merge branch 'selenium4' into custom_framework
cnishina Nov 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var passingTests = [
// 'node built/cli.js spec/driverProviderLocalConf.js --useBlockingProxy',
// 'node built/cli.js spec/getCapabilitiesConf.js',
'node built/cli.js spec/controlLockConf.js',
// 'node built/cli.js spec/customFramework.js',
'node built/cli.js spec/customFramework.js',
// 'node built/cli.js spec/noGlobalsConf.js',
// 'node built/cli.js spec/angular2Conf.js',
'node built/cli.js spec/hybridConf.js',
Expand Down
4 changes: 2 additions & 2 deletions spec/custom/smoke_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
describe('smoke jasmine tests', function() {
it('should do some dummy test', function() {
describe('smoke jasmine tests', () => {
it('should do some dummy test', () => {
expect(1).toBe(1);
});
});
3 changes: 2 additions & 1 deletion spec/customFramework.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
var env = require('./environment.js');
const env = require('./environment.js');

exports.config = {
seleniumAddress: env.seleniumAddress,
SELENIUM_PROMISE_MANAGER: false,

framework: 'custom',
frameworkPath: './custom/framework.js',
Expand Down