Merge pull request #554 from Gaurav0/flakey_tests

Try to fix flakey tests

Author: Gaurav0

app/components/dummy-app.js

@@ -74,5 +74,7 @@ export default Ember.Component.extend(ResizeMixin, {
     if (oldIframe) {
       oldIframe.parentNode.removeChild(oldIframe);
     }
+
+    this.get('app').setCurrentIFrame(null);
   }
 });

app/components/twiddle-panes.js

@@ -25,6 +25,8 @@ export default Ember.Component.extend({
   },
 
   willDestroyElement() {
+    this._super(...arguments);
+
     this.cleanupDrags();
   },
 

app/mixins/app-builder.js

@@ -34,5 +34,11 @@ export default Ember.Mixin.create({
       yield timeout(500);
       yield this.get('buildApp').perform();
     }
-  }).restartable()
+  }).restartable(),
+
+  willDestroyElement() {
+    this._super(...arguments);
+
+    this.get('dependencyResolver.resolveAddonsTask').cancelAll();
+  }
 });

package.json

@@ -59,7 +59,7 @@
     "ember-cli-sri": "~2.1.0",
     "ember-cli-test-loader": "~1.1.0",
     "ember-cli-uglify": "~1.2.0",
-    "ember-concurrency": "~0.7.1",
+    "ember-concurrency": "~0.8.2",
     "ember-data": "~2.11.0",
     "ember-disable-proxy-controllers": "1.0.1",
     "ember-export-application-global": "~1.1.1",

tests/acceptance/gist-test.js

@@ -397,6 +397,7 @@ test('own gist can be copied into a new one', function(assert) {
 
     click("#live-reload");
     click('.test-copy-action');
+    click(".run-now");
     waitForLoadedIFrame();
   });
 
@@ -427,6 +428,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");
     waitForLoadedIFrame();
   });
 

tests/acceptance/git-revision-test.js

@@ -58,6 +58,7 @@ test('Able to copy a revision into new gist', function(assert) {
   click('.test-copy-action');
 
   andThen(function() {
+    click(".run-now");
     waitForLoadedIFrame();
   });
 
@@ -87,9 +88,9 @@ 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");
+    click("#live-reload");
+  });
 
   createGist({
     files: [
@@ -104,9 +105,11 @@ test('Able to go from current version to revision and back via the UI', function
     doNotCreateGist: true
   });
 
-  click(".test-version-action");
-  click(".run-now");
-  waitForLoadedIFrame();
+  andThen(() => {
+    click(".test-version-action");
+    click(".run-now");
+    waitForLoadedIFrame();
+  });
 
   andThen(() => {
     assert.equal(outputContents('div'), 'Hello, ...');

tests/helpers/module-for-acceptance.js

@@ -3,7 +3,7 @@ import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
-const { RSVP: { Promise } } = Ember;
+const { RSVP: { Promise }, run } = Ember;
 
 export default function(name, options = {}) {
   module(name, {
@@ -16,6 +16,7 @@ export default function(name, options = {}) {
     },
 
     afterEach() {
+      run.cancelTimers();
       let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
       return Promise.resolve(afterEach).then(() => destroyApp(this.application));
     }

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

@@ -17,13 +17,15 @@ export default function(app, url) {
           resolve();
         }
 
-        if (app.testHelpers.find('iframe').length === 0 && times++ < 10) {
+        if (times++ >= 10) {
+          run.cancelTimers();
+        } else if (app.testHelpers.find('iframe').length === 0) {
           run.later(waitForRender, 10);
           return;
         }
         iframe_window = outputPane();
         if (iframe_window.document.readyState === 'complete') {
-          onWindowLoad();
+          resolve();
         } else {
           iframe_window.addEventListener('load', onWindowLoad);
         }