Merge pull request #565 from Gaurav0/flakey_tests_2

Try to fix flakey tests again

Author: Gaurav0

app/services/ember-cli.js

@@ -354,9 +354,7 @@ export default Ember.Service.extend({
       testJSFiles.forEach(jsFile => {
         depScriptTags += `<script type="text/javascript" src="${window.assetMap[jsFile]}"></script>`;
       });
-
-      // Temporary fix; real fix waiting for https://github.com/qunitjs/qunit/issues/1119
-      // Real fix should use copy of QUnitAdapter from ember-qunit.
+      
       testStuff += `<script type="text/javascript">
         Ember.Test.adapter = require('ember-qunit').QUnitAdapter.create();
       </script>`;

blueprints/twiddle.json

@@ -9,9 +9,9 @@
   },
   "dependencies": {
     "jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.js",
-    "ember": "2.12.0",
-    "ember-template-compiler": "2.12.0",
-    "ember-testing": "2.12.0"
+    "ember": "2.12.2",
+    "ember-template-compiler": "2.12.2",
+    "ember-testing": "2.12.2"
   },
   "addons": {
     "ember-data": "2.12.1"

package.json

@@ -60,7 +60,7 @@
     "ember-cli-test-loader": "~1.1.0",
     "ember-cli-uglify": "~1.2.0",
     "ember-concurrency": "~0.8.2",
-    "ember-data": "~2.11.0",
+    "ember-data": "~2.12.0",
     "ember-disable-proxy-controllers": "1.0.1",
     "ember-export-application-global": "~1.1.1",
     "ember-git-version": "~0.1.1",

tests/.jshintrc

@@ -27,6 +27,7 @@
     "runGist",
     "runRevision",
     "waitForLoadedIFrame",
+    "waitForUnloadedIFrame",
     "outputPane",
     "outputContents"
   ],

tests/acceptance/gist-test.js

@@ -363,6 +363,7 @@ test('editing a file updates gist', function(assert) {
     assert.equal(find(firstColumnTextarea).val(), '<div class="index">some text</div>');
 
     click(".run-now");
+    waitForUnloadedIFrame();
     waitForLoadedIFrame();
   });
 
@@ -397,7 +398,6 @@ test('own gist can be copied into a new one', function(assert) {
 
     click("#live-reload");
     click('.test-copy-action');
-    click(".run-now");
     waitForLoadedIFrame();
   });
 
@@ -429,6 +429,7 @@ test('accessing /:gist/copy creates a new Twiddle with a copy of the gist', func
     click("#live-reload");
     visit('/35de43cb81fc35ddffb2/copy');
     click(".run-now");
+    waitForUnloadedIFrame();
     waitForLoadedIFrame();
   });
 

tests/acceptance/git-revision-test.js

@@ -56,11 +56,8 @@ test('Able to copy a revision into new gist', function(assert) {
 
   click("#live-reload");
   click('.test-copy-action');
-
-  andThen(function() {
-    click(".run-now");
-    waitForLoadedIFrame();
-  });
+  waitForUnloadedIFrame();
+  waitForLoadedIFrame();
 
   andThen(function() {
     assert.equal(find('.title input').val(), "New Twiddle", "Description is reset");
@@ -88,8 +85,6 @@ test('Able to go from current version to revision and back via the UI', function
 
   andThen(() => {
     assert.equal(outputContents('div'), 'Hello, World!');
-
-    click("#live-reload");
   });
 
   createGist({
@@ -107,15 +102,15 @@ test('Able to go from current version to revision and back via the UI', function
 
   andThen(() => {
     click(".test-version-action");
-    click(".run-now");
+    waitForUnloadedIFrame();
     waitForLoadedIFrame();
   });
 
   andThen(() => {
     assert.equal(outputContents('div'), 'Hello, ...');
 
     click(".test-show-current-version");
-    click(".run-now");
+    waitForUnloadedIFrame();
     waitForLoadedIFrame();
   });
 

tests/helpers/wait-for-loaded-iframe.js

@@ -1,6 +1,6 @@
 import Ember from "ember";
 
-const { RSVP, run } = Ember;
+const { RSVP, run, warn } = Ember;
 
 export default function(app, url) {
   let iframe_window;
@@ -13,21 +13,23 @@ export default function(app, url) {
 
       run.schedule('afterRender', function waitForRender() {
         function onWindowLoad() {
-          iframe_window.removeEventListener('load', onWindowLoad);
+          iframe_window.document.removeEventListener('DOMContentLoaded', onWindowLoad);
           resolve();
         }
 
         if (times++ >= 10) {
+          warn('Timeout: Twiddle has failed to load');
           run.cancelTimers();
         } else if (app.testHelpers.find('iframe').length === 0) {
           run.later(waitForRender, 10);
           return;
         }
         iframe_window = outputPane();
-        if (iframe_window.document.readyState === 'complete') {
+        let readyState = iframe_window.document.readyState;
+        if (readyState === 'complete' || readyState === 'interactive') {
           resolve();
         } else {
-          iframe_window.addEventListener('load', onWindowLoad);
+          iframe_window.document.addEventListener('DOMContentLoaded', onWindowLoad);
         }
       });
     });

tests/helpers/wait-for-unloaded-iframe.js

@@ -0,0 +1,17 @@
+import Ember from 'ember';
+import wait from 'ember-test-helpers/wait';
+
+const { Test } = Ember;
+
+function hasNoIframe() {
+  return this.app.testHelpers.find('iframe').length > 0;
+}
+
+export default function(app) {
+  let ctx = { app };
+  Test.registerWaiter(ctx, hasNoIframe);
+
+  return wait().then(() => {
+    Test.unregisterWaiter(ctx, hasNoIframe);
+  });
+}

tests/test-helper.js

@@ -7,6 +7,7 @@ import createGist from "./helpers/create-gist";
 import runGist from "./helpers/run-gist";
 import runRevision from "./helpers/run-revision";
 import waitForLoadedIFrame from './helpers/wait-for-loaded-iframe';
+import waitForUnloadedIFrame from './helpers/wait-for-unloaded-iframe';
 
 setResolver(resolver);
 
@@ -25,3 +26,4 @@ Ember.Test.registerHelper('createGist', createGist);
 Ember.Test.registerAsyncHelper('runGist', runGist);
 Ember.Test.registerAsyncHelper('runRevision', runRevision);
 Ember.Test.registerAsyncHelper('waitForLoadedIFrame', waitForLoadedIFrame);
+Ember.Test.registerAsyncHelper('waitForUnloadedIFrame', waitForUnloadedIFrame);

tests/unit/services/ember-cli-test.js

@@ -30,6 +30,25 @@ test('compiling a gist works', function(assert) {
         filePath: 'controllers/application.js',
         extension: '.js',
         content: 'import Ember from "ember";\n\nexport default Ember.Controller.extend({appName:"foo"});'
+      }),
+      Ember.Object.create({
+        filePath: 'twiddle.json',
+        extension: '.json',
+        content: `{
+                  "version": "0.7.0",
+                  "EmberENV": {
+                    "FEATURES": {}
+                  },
+                  "options": {
+                    "use_pods": false,
+                    "enable-testing": false
+                  },
+                  "dependencies": {
+                    "jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.js",
+                    "ember": "https://cdnjs.cloudflare.com/ajax/libs/ember.js/2.4.3/ember.debug.js",
+                    "ember-data": "https://cdnjs.cloudflare.com/ajax/libs/ember-data.js/2.4.0/ember-data.js"
+                  }
+                }`
       })
     ])
   });