fix(build): simplify the e2e/perf config via command line arguments

Author: tbosch

README.md

@@ -54,12 +54,25 @@ the transpiler is reloaded. With that it is possible to make changes
 to the preprocessor and run the tests without exiting karma
 (just touch a test file that you would like to run).
 
+### E2e tests
+
+1. `gulp build.js.cjs` (builds benchpress and tests into `dist/js/cjs` folder)
+2. `gulp serve.js.prod serve.js.dart2js` (runs local webserver)
+3. `protractor protractor-js.conf.js`: JS e2e tests
+4. `protractor protractor-dart2js.conf.js`: Dart2JS e2e tests
+
+Angular specific command line options when running protractor:
+`protractor protractor-{js|dart2js}-conf.js --ng-help`
+
 ### Performance tests
 
 1. `gulp build.js.cjs` (builds benchpress and tests into `dist/js/cjs` folder)
 2. `gulp serve.js.prod serve.js.dart2js` (runs local webserver)
-3. `protractor protractor-perf-js.conf.js`: JS performance tests
-4. `protractor protractor-perf-dart2js.conf.js`: Dart2JS performance tests
+3. `protractor protractor-js.conf.js --benchmark`: JS performance tests
+4. `protractor protractor-dart2js.conf.js --benchmark`: Dart2JS performance tests
+
+Angular specific command line options when running protractor (e.g. force gc, ...):
+`protractor protractor-{js|dart2js}-conf.js --ng-help`
 
 ### Examples
 

protractor-dart2js.conf.js

@@ -0,0 +1,13 @@
+var data = module.exports = require('./protractor-shared.js');
+var config = data.config;
+
+config.baseUrl = 'http://localhost:8002/';
+
+config.exclude.push(
+ 'dist/js/cjs/examples/e2e_test/sourcemap/sourcemap_spec.js',
+ // TODO: remove this line when largetable dart has been added
+ 'dist/js/cjs/benchmarks_external/e2e_test/largetable_perf.js'
+);
+
+data.createBenchpressRunner({ lang: 'dart' });
+

protractor-e2e-dart2js.conf.js

@@ -1,16 +1,10 @@
-var data = module.exports = require('./protractor-e2e-shared.js');
+var data = module.exports = require('./protractor-shared.js');
 var config = data.config;
 
 config.baseUrl = 'http://localhost:8001/';
-
 // TODO: remove exclusion when JS verison of scrolling benchmark is available
-config.exclude = config.exclude || [];
+config.exclude.push('dist/js/cjs/benchmarks_external/e2e_test/naive_infinite_scroll_spec.js');
 config.exclude.push('dist/js/cjs/benchmarks_external/e2e_test/naive_infinite_scroll_perf.js');
 
-data.createBenchpressRunner({
- forceGc: false,
- lang: 'js',
- test: true,
- sampleSize: 1
-});
+data.createBenchpressRunner({ lang: 'js' });
 

protractor-e2e-shared.js

@@ -1,12 +1,69 @@
 // load traceur runtime as our tests are written in es6
 require('traceur/bin/traceur-runtime.js');
 
-var nodeUuid = require('node-uuid');
-var benchpress = require('./dist/js/cjs/benchpress/benchpress');
-var SeleniumWebDriverAdapter = require('./dist/js/cjs/benchpress/src/webdriver/selenium_webdriver_adapter').SeleniumWebDriverAdapter;
-var cmdArgs = require('minimist')(process.argv);
+var argv = require('yargs')
+ .usage('Angular e2e/perf test options.')
+ .options({
+ 'sample-size': {
+ describe: 'sample size',
+ default: 20,
+ type: 'boolean'
+ },
+ 'force-gc': {
+ describe: 'force gc',
+ default: false,
+ type: 'boolean'
+ },
+ 'benchmark': {
+ describe: 'whether to run the benchmarks',
+ default: false
+ },
+ 'browsers': {
+ describe: 'preconfigured browsers that should be used',
+ default: 'ChromeDesktop'
+ }
+ })
+ .help('ng-help')
+ .wrap(40)
+ .argv
 
-var cmdLineBrowsers = cmdArgs.browsers ? cmdArgs.browsers.split(',') : [];
+var browsers = argv['browsers'].split(',');
+
+var BROWSER_CAPS = {
+ Dartium: {
+ name: 'Dartium',
+ browserName: 'chrome',
+ chromeOptions: {
+ 'binary': process.env.DARTIUM,
+ 'args': ['--js-flags=--expose-gc']
+ },
+ loggingPrefs: {
+ performance: 'ALL',
+ browser: 'ALL'
+ }
+ },
+ ChromeDesktop: {
+ browserName: 'chrome',
+ chromeOptions: {
+ 'args': ['--js-flags=--expose-gc']
+ },
+ loggingPrefs: {
+ performance: 'ALL',
+ browser: 'ALL'
+ }
+ },
+ ChromeAndroid: {
+ browserName: 'chrome',
+ chromeOptions: {
+ androidPackage: 'com.android.chrome',
+ 'args': ['--js-flags=--expose-gc']
+ },
+ loggingPrefs: {
+ performance: 'ALL',
+ browser: 'ALL'
+ }
+ }
+};
 
 var config = exports.config = {
  // Disable waiting for Angular as we don't have an integration layer yet...
@@ -23,11 +80,31 @@ var config = exports.config = {
  }
  },
 
+ specs: argv['benchmark'] ? [
+ 'dist/js/cjs/**/e2e_test/**/*_perf.js'
+ ] : [
+ 'dist/js/cjs/**/e2e_test/**/*_spec.js',
+ 'dist/js/cjs/**/e2e_test/**/*_perf.js'
+ ],
+
+ exclude: [
+ 'dist/js/cjs/**/node_modules/**',
+ ],
+
+ multiCapabilities: browsers.map(function(browserName) {
+ var caps = BROWSER_CAPS[browserName];
+ console.log('Testing against', browserName);
+ if (!caps) {
+ throw new Error('Not configured browser name: '+browserName);
+ }
+ return caps;
+ }),
+
  framework: 'jasmine2',
 
  jasmineNodeOpts: {
  showColors: true,
- defaultTimeoutInterval: 30000
+ defaultTimeoutInterval: argv.benchpress ? 80000 : 30000
  },
  params: {
  benchmark: {
@@ -39,6 +116,11 @@ var config = exports.config = {
 };
 
 exports.createBenchpressRunner = function(options) {
+ var nodeUuid = require('node-uuid');
+ var benchpress = require('./dist/js/cjs/benchpress/benchpress');
+ var SeleniumWebDriverAdapter =
+ require('./dist/js/cjs/benchpress/src/webdriver/selenium_webdriver_adapter').SeleniumWebDriverAdapter;
+
  // TODO(tbosch): add cloud reporter again (only when !options.test)
  // var cloudReporterConfig;
  // if (process.env.CLOUD_SECRET_PATH) {
@@ -59,67 +141,19 @@ exports.createBenchpressRunner = function(options) {
  benchpress.bind(benchpress.WebDriverAdapter).toFactory(
  function() { return new SeleniumWebDriverAdapter(global.browser); }, []
  ),
- benchpress.bind(benchpress.Options.FORCE_GC).toValue(options.forceGc),
+ benchpress.bind(benchpress.Options.FORCE_GC).toValue(argv['force-gc']),
  benchpress.bind(benchpress.Options.DEFAULT_DESCRIPTION).toValue({
  'lang': options.lang,
  'runId': runId
  })
  ];
- if (options.test) {
+ if (argv['benchmark']) {
+ bindings.push(benchpress.RegressionSlopeValidator.BINDINGS);
+ bindings.push(benchpress.bind(benchpress.RegressionSlopeValidator.SAMPLE_SIZE).toValue(argv['sample-size']));
+ } else {
  bindings.push(benchpress.SizeValidator.BINDINGS);
  bindings.push(benchpress.bind(benchpress.SizeValidator.SAMPLE_SIZE).toValue(1));
- } else {
- bindings.push(benchpress.RegressionSlopeValidator.BINDINGS);
- bindings.push(benchpress.bind(benchpress.RegressionSlopeValidator.SAMPLE_SIZE).toValue(options.sampleSize));
  }
 
  global.benchpressRunner = new benchpress.Runner(bindings);
 }
-
-
-var POSSIBLE_CAPS = {
- Dartium: {
- name: 'Dartium',
- browserName: 'chrome',
- chromeOptions: {
- 'binary': process.env.DARTIUM,
- 'args': ['--js-flags=--expose-gc']
- },
- loggingPrefs: {
- performance: 'ALL',
- browser: 'ALL'
- }
- },
- ChromeDesktop: {
- browserName: 'chrome',
- chromeOptions: {
- 'args': ['--js-flags=--expose-gc']
- },
- loggingPrefs: {
- performance: 'ALL',
- browser: 'ALL'
- }
- },
- ChromeAndroid: {
- browserName: 'chrome',
- chromeOptions: {
- androidPackage: 'com.android.chrome',
- 'args': ['--js-flags=--expose-gc']
- },
- loggingPrefs: {
- performance: 'ALL',
- browser: 'ALL'
- }
- }
-};
-if (cmdLineBrowsers.length) {
- config.multiCapabilities = cmdLineBrowsers.map(function(browserName) {
- var caps = POSSIBLE_CAPS[browserName];
- if (!caps) {
- throw new Error('Not configured browser name: '+browserName);
- }
- return caps;
- });
-} else {
- config.multiCapabilities = [POSSIBLE_CAPS.ChromeDesktop];
-}

protractor-e2e-js.conf.js renamed to protractor-js.conf.js

@@ -21,4 +21,4 @@ trap killServer EXIT
 # wait for server to come up!
 sleep 10
 
-./node_modules/.bin/protractor protractor-e2e-dart2js.conf.js --browsers=$E2E_BROWSERS
+./node_modules/.bin/protractor protractor-dart2js.conf.js --browsers=$E2E_BROWSERS