More fixes

Author: Gaurav0

app/components/file-editor-column.js

@@ -43,19 +43,19 @@ export default Ember.Component.extend({
 
     valueUpdated(value, __, changeObj) {
       const isUserChange = changeObj.origin !== 'setValue';
-      this.attrs.contentChanged(isUserChange, value);
+      this.get('contentChanged')(isUserChange, value);
     },
 
     removeColumn(col) {
-      this.attrs.removeColumn(col);
+      this.get('removeColumn')(col);
     },
 
     addColumn() {
-      this.attrs.addColumn();
+      this.get('addColumn')();
     },
 
     showFileTree() {
-      this.attrs.showFileTree();
+      this.get('showFileTree')();
     }
   }
 });

app/mixins/app-builder.js

@@ -14,6 +14,7 @@ export default Ember.Mixin.create({
     try {
       const buildOutput = yield this.get('emberCli').compileGist(this.get('model'));
       this.set('isBuilding', false);
+      this.set('isOutputting', true);
       this.set('buildOutput', buildOutput);
     } catch(errors) {
       this.set('isBuilding', false);
@@ -26,7 +27,7 @@ export default Ember.Mixin.create({
         console.error(errors);
       }
     }
-  }),
+  }).enqueue(),
 
   rebuildApp: task(function *() {
     if (this.get('isLiveReload')) {

app/templates/components/file-editor-column.hbs

@@ -52,6 +52,6 @@
       fixedGutter=true
       lineWrapping=true
       tabSize=2)
-    valueUpdated="valueUpdated"
+    valueUpdated=(action "valueUpdated")
 }}
 {{/if}}

package.json

@@ -74,7 +74,7 @@
     "ember-route-action-helper": "^1.0.0",
     "ember-source": "~2.11.0",
     "ember-test-helpers": "~0.6.3",
-    "ivy-codemirror": "2.0.2",
+    "ivy-codemirror": "~2.0.3",
     "loader.js": "~4.0.10",
     "moment": "~2.15.2",
     "moment-timezone": "~0.5.4",

tests/acceptance/gist-test.js

@@ -354,6 +354,7 @@ test('editing a file updates gist', function(assert) {
     return;
   }
 
+  click("#live-reload");
   click(firstColumnTextarea);
   fillIn(firstColumnTextarea, '<div class="index">some text</div>');
   triggerEvent(firstColumnTextarea, "blur");
@@ -362,7 +363,6 @@ test('editing a file updates gist', function(assert) {
     assert.equal(find(firstColumnTextarea).val(), '<div class="index">some text</div>');
   });
 
-  click("#live-reload");
   click(".run-now");
   waitForLoadedIFrame();
 
@@ -391,15 +391,14 @@ test('own gist can be copied into a new one', function(assert) {
   });
 
   fillIn('.title input', "my twiddle");
+  keyEvent('.title input', 'keyup', 13);
   andThen(function() {
     assert.equal(find('.title input').val(), "my twiddle");
   });
 
+  click("#live-reload");
   click('.test-copy-action');
-
-  andThen(function() {
-    waitForLoadedIFrame();
-  });
+  waitForLoadedIFrame();
 
   andThen(function() {
     assert.equal(find('.title input').val(), "New Twiddle", "Description is reset");
@@ -427,11 +426,10 @@ test('accessing /:gist/copy creates a new Twiddle with a copy of the gist', func
     assert.equal(find('.test-unsaved-indicator').length, 1, "Changing title triggers unsaved indicator");
   });
 
+  click("#live-reload");
   visit('/35de43cb81fc35ddffb2/copy');
-
-  andThen(function() {
-    waitForLoadedIFrame();
-  });
+  click('.run-now');
+  waitForLoadedIFrame();
 
   andThen(function() {
     assert.equal(currentURL(), '/');

tests/acceptance/git-revision-test.js

@@ -54,6 +54,7 @@ test('Able to copy a revision into new gist', function(assert) {
     assert.equal(find('.title input').val(), "my twiddle");
   });
 
+  click("#live-reload");
   click('.test-copy-action');
 
   andThen(function() {
@@ -88,6 +89,8 @@ test('Able to go from current version to revision and back via the UI', function
     assert.equal(outputContents('div'), 'Hello, World!');
   });
 
+  click("#live-reload");
+
   createGist({
     files: [
       {
@@ -102,13 +105,15 @@ test('Able to go from current version to revision and back via the UI', function
   });
 
   click(".test-version-action");
+  click(".run-now");
   waitForLoadedIFrame();
 
   andThen(() => {
     assert.equal(outputContents('div'), 'Hello, ...');
   });
 
   click(".test-show-current-version");
+  click(".run-now");
   waitForLoadedIFrame();
 
   andThen(() => {

tests/acceptance/run-now-test.js

@@ -14,10 +14,7 @@ test('Able to reload the Twiddle', function(assert) {
 
   runGist(files);
 
-  // turn off live reloading
-  andThen(function() {
-    find("#live-reload").click();
-  });
+  click("#live-reload");
 
   andThen(function() {
     assert.equal(outputPane().find('input').val(), 'initial value');
@@ -27,13 +24,10 @@ test('Able to reload the Twiddle', function(assert) {
 
   andThen(function() {
     assert.equal(outputPane().find('input').val(), 'new value');
-    
-    find(".run-now").click();
   });
 
-  andThen(function() {
-    waitForLoadedIFrame();
-  });
+  click(".run-now");
+  waitForLoadedIFrame();
 
   andThen(function() {
     assert.equal(outputPane().find('input').val(), 'initial value');

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

@@ -22,7 +22,7 @@ export default function(app, url) {
           return;
         }
         iframe_window = outputPane();
-        if (iframe_window.loaded && iframe_window.document.readyState === 'complete') {
+        if (iframe_window.document.readyState === 'complete') {
           onWindowLoad();
         } else {
           iframe_window.addEventListener('load', onWindowLoad);