honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(spec): add spec argument to the protractor config, allows to filter tests to run

Browse Source 
Closes #695
This commit is contained in:
Tobias Bosch 2015-02-23 10:34:58 -08:00
parent f54f4e89e0
commit 0a0c0d8302
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -62,7 +62,7 @@ to the preprocessor and run the tests without exiting karma
4. `protractor protractor-dart2js.conf.js`: Dart2JS e2e tests 4. `protractor protractor-dart2js.conf.js`: Dart2JS e2e tests
Angular specific command line options when running protractor: Angular specific command line options when running protractor:
`protractor protractor-{js|dart2js}-conf.js --ng-help` - `protractor protractor-{js|dart2js}-conf.js --ng-help`
### Performance tests ### Performance tests

30
protractor-shared.js
View File

@ -10,7 +10,7 @@ var argv = require('yargs')
type: 'boolean' type: 'boolean'
}, },
'force-gc': { 'force-gc': {
describe: 'force gc', describe: 'force gc.',
default: false, default: false,
type: 'boolean' type: 'boolean'
}, },
@ -19,8 +19,12 @@ var argv = require('yargs')
default: false default: false
}, },
'browsers': { 'browsers': {
describe: 'preconfigured browsers that should be used', describe: 'comma separated list of preconfigured browsers to use',
default: 'ChromeDesktop' default: 'ChromeDesktop'
},
'spec': {
describe: 'comma separated file patterns to test',
default: false
} }
}) })
.help('ng-help') .help('ng-help')
@ -95,6 +99,21 @@ var BROWSER_CAPS = {
} }
}; };
var getBenchmarkFiles = function (benchmark, spec) {
var specFiles = [];
var perfFiles = [];
if (spec.length) {
spec.split(',').forEach(function (name) {
specFiles.push('dist/js/cjs/**/e2e_test/' + name)
perfFiles.push('dist/js/cjs/**/e2e_test/' + name)
});
} else {
specFiles.push('dist/js/cjs/**/e2e_test/**/*_spec.js');
perfFiles.push('dist/js/cjs/**/e2e_test/**/*_perf.js');
}
return benchmark ? perfFiles : specFiles.concat(perfFiles);
};
var config = exports.config = { var config = exports.config = {
// Disable waiting for Angular as we don't have an integration layer yet... // Disable waiting for Angular as we don't have an integration layer yet...
// TODO(tbosch): Implement a proper debugging API for Ng2.0, remove this here // TODO(tbosch): Implement a proper debugging API for Ng2.0, remove this here
@ -110,12 +129,7 @@ var config = exports.config = {
} }
}, },
specs: argv['benchmark'] ? [ specs: getBenchmarkFiles(argv['benchmark'], argv['spec']),
'dist/js/cjs/**/e2e_test/**/*_perf.js'
] : [
'dist/js/cjs/**/e2e_test/**/*_spec.js',
'dist/js/cjs/**/e2e_test/**/*_perf.js'
],
exclude: [ exclude: [
'dist/js/cjs/**/node_modules/**', 'dist/js/cjs/**/node_modules/**',