Merge pull request #211 from ember-learn/test-stability

Try and get tests into a more stable place

Author: dfreeman

.travis.yml

@@ -17,11 +17,6 @@ env:
     # See https://git.io/vdao3 for details.
     - JOBS=1
 
-before_install:
-  # Locking to Yarn 1.0.2 to work around https://github.com/yarnpkg/yarn/issues/4612
-  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.2
-  - export PATH=$HOME/.yarn/bin:$PATH
-
 install:
   - yarn install
 

package.json

@@ -49,7 +49,7 @@
     "ember-keyboard": "^3.0.0",
     "ember-modal-dialog": "2.4.3",
     "ember-responsive": "^3.0.0-beta.1",
-    "ember-router-scroll": "^0.6.0",
+    "ember-router-scroll": "^0.7.1",
     "ember-svg-jar": "^1.2.1",
     "ember-tether": "^1.0.0-beta.2",
     "ember-truth-helpers": "^2.0.0",

tests/acceptance/sandbox/api/components-test.js

@@ -1,7 +1,7 @@
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
-import { currentURL, visit } from '@ember/test-helpers';
+import { currentURL, visit, waitUntil } from '@ember/test-helpers';
 
 import modulePage from '../../../pages/api/module';
 
@@ -32,13 +32,14 @@ module('Acceptance | API | components', function(hooks) {
     assert.ok(indexItems.includes('Yields') && indexItems.includes('Arguments'), 'correct sections rendered');
 
     await modulePage.toggles.findOne({ text: 'Internal' }).click();
+    await waitUntil(() => modulePage.index.items.length === 12);
 
     indexItems = modulePage.index.items.map(i => i.text);
 
-    assert.equal(indexItems.length, 12, 'correct number of items rendered');
     assert.ok(indexItems.includes('Fields') && indexItems.includes('Methods'), 'correct sections rendered');
 
     await modulePage.toggles.findOne({ text: 'Private' }).click();
+    await waitUntil(() => modulePage.index.items.length === 13);
 
     indexItems = modulePage.index.items.map(i => i.text);
 
@@ -51,6 +52,7 @@ module('Acceptance | API | components', function(hooks) {
 
     assert.equal(modulePage.searchResults.items.length, 0, 'no search results shown');
     await modulePage.fillInSearchQuery('sub-subsection');
+    await waitUntil(() => modulePage.searchResults.items.length > 0);
     assert.equal(modulePage.searchResults.items.length, 1, 'one search result shown');
   });
 });

yarn.lock

@@ -2763,9 +2763,9 @@ electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47:
   version "1.3.48"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900"
 
-ember-app-scheduler@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/ember-app-scheduler/-/ember-app-scheduler-0.2.1.tgz#4af70ce7b4d5792a96eff46c0c2f4a737ec3ad63"
+ember-app-scheduler@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/ember-app-scheduler/-/ember-app-scheduler-1.0.2.tgz#787beb2d4b40dc37df42d084f3a7a039bddcb0dd"
   dependencies:
     ember-cli-babel "^6.3.0"
 
@@ -3534,11 +3534,11 @@ ember-router-generator@^1.2.3:
   dependencies:
     recast "^0.11.3"
 
-ember-router-scroll@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/ember-router-scroll/-/ember-router-scroll-0.6.0.tgz#e94fda377bd00c45d866123ec6dcf05654d4d987"
+ember-router-scroll@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/ember-router-scroll/-/ember-router-scroll-0.7.1.tgz#0fc4b9be116ef97ce974938104cc766f4e56a127"
   dependencies:
-    ember-app-scheduler "^0.2.0"
+    ember-app-scheduler "^1.0.1"
     ember-cli-babel "^6.6.0"
     ember-getowner-polyfill "^2.0.1"