testing: enable chai-as-promised for integ tests (ampproject#27077)

* testing: enable chai-as-promised for integ * lint hack * try different spot for the hack * concisify / remove todo * nits + fixes
samouri · Mar 12, 2020 · 6b439ae · 6b439ae
1 parent 286109a
commit 6b439ae
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 54 deletions.
diff --git a/build-system/tasks/helpers.js b/build-system/tasks/helpers.js
@@ -100,7 +100,14 @@ const MINIFIED_TARGETS = [
  */
 const BABELIFY_GLOBAL_TRANSFORM = {
   global: true, // Transform node_modules
-  ignore: devDependencies(), // Ignore devDependencies
+  /**
+   * Ignore devDependencies, except for 'chai-as-promised' which contains ES6 code.
+   * ES6 code is fine for most test environments, but not for integration tests
+   * running on SauceLabs since some older browsers need ES5.
+   */
+  ignore: devDependencies().filter(
+    dep => dep.indexOf('chai-as-promised') === -1
+  ),
 };
 
 /**

diff --git a/build-system/tasks/runtime-test/runtime-test-base.js b/build-system/tasks/runtime-test/runtime-test-base.js
@@ -127,7 +127,7 @@ function getFiles(testType) {
 
   switch (testType) {
     case 'unit':
-      files = testConfig.commonUnitTestPaths.concat(testConfig.chaiAsPromised);
+      files = testConfig.commonUnitTestPaths;
       if (argv.files) {
         return files.concat(argv.files);
       }
@@ -147,7 +147,7 @@ function getFiles(testType) {
       return files.concat(testConfig.integrationTestPaths);
 
     case 'a4a':
-      return testConfig.chaiAsPromised.concat(testConfig.a4aTestPaths);
+      return testConfig.a4aTestPaths;
 
     default:
       throw new Error(`Test type ${testType} was not recognized`);

diff --git a/build-system/test-configs/config.js b/build-system/test-configs/config.js
@@ -73,8 +73,6 @@ const a4aTestPaths = initTestsPath.concat([
   'ads/google/a4a/test/*.js',
 ]);
 
-const chaiAsPromised = ['test/chai-as-promised/chai-as-promised.js'];
-
 const unitTestPaths = [
   'test/unit/**/*.js',
   'ads/**/test/test-*.js',
@@ -204,7 +202,6 @@ const changelogIgnoreFileTypes = /\.md|\.json|\.yaml|LICENSE|CONTRIBUTORS$/;
 /** @const  */
 module.exports = {
   a4aTestPaths,
-  chaiAsPromised,
   changelogIgnoreFileTypes,
   commonIntegrationTestPaths,
   commonUnitTestPaths,

diff --git a/extensions/amp-bind/0.1/test/integration/test-bind-impl.js b/extensions/amp-bind/0.1/test/integration/test-bind-impl.js
@@ -983,13 +983,8 @@ describe
               mystate: {mykey: 'myval'},
             });
 
-            // Integration tests may not use chai-as-promised.
-            try {
-              await bind.getStateAsync('mystate.mykey');
-              expect.fail();
-            } catch (err) {
-              expect(err).match(/#mystate/);
-            }
+            const state = bind.getStateAsync('mystate.mykey');
+            return expect(state).to.eventually.rejectedWith(/#mystate/);
           });
 
           it('should not wait if the still-loading state is irrelevant', async () => {

diff --git a/test/_init_tests.js b/test/_init_tests.js
@@ -492,6 +492,8 @@ afterEach(function() {
   cancelTimersForTesting();
 });
 
+chai.use(require('chai-as-promised')); // eslint-disable-line 
+
 chai.Assertion.addMethod('attribute', function(attr) {
   const obj = this._obj;
   const tagName = obj.tagName.toLowerCase();

diff --git a/test/chai-as-promised/.eslintrc b/test/chai-as-promised/.eslintrc
diff --git a/test/chai-as-promised/chai-as-promised.js b/test/chai-as-promised/chai-as-promised.js