Merge pull request #1140 from Turbo87/native-dom-helpers

Use "ember-native-dom-helpers" for simulated user actions

Author: Turbo87

app/templates/crate/version.hbs

@@ -188,12 +188,12 @@
                 </ul>
             </div>
 
-            <div class='section' id='crate-versions'>
+            <div class='section' id='crate-versions' data-test-versions>
                 <h3>Versions</h3>
                 <ul>
                     {{#each smallSortedVersions as |version|}}
                         <li>
-                            {{#link-to 'crate.version' version.num}}
+                            {{#link-to 'crate.version' version.num data-test-version-link=version.num}}
                                 {{ version.num }}
                             {{/link-to}}
                             <span class='date'>{{moment-format version.created_at 'll'}}</span>

package-lock.json

@@ -52,6 +52,7 @@
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-metrics": "^0.10.0",
     "ember-moment": "^7.3.1",
+    "ember-native-dom-helpers": "^0.5.4",
     "ember-normalize": "^1.0.0",
     "ember-page-title": "^3.2.1",
     "ember-prism": "^0.1.0",

package.json

@@ -1,7 +1,4 @@
 module.exports = {
-    env: {
-        embertest: true
-    },
     globals: {
         'server': true,
         'wait': true,

tests/.eslintrc.js

@@ -1,4 +1,5 @@
 import { test } from 'qunit';
+import { visit } from 'ember-native-dom-helpers';
 import moduleForAcceptance from 'cargo/tests/helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | categories');

tests/acceptance/categories-test.js

@@ -1,4 +1,5 @@
 import { test } from 'qunit';
+import { click, visit, currentURL, currentRouteName } from 'ember-native-dom-helpers';
 import moduleForAcceptance from 'cargo/tests/helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | crate page');
@@ -123,6 +124,6 @@ test('crates license is supplied by version', async function(assert) {
     await visit('/crates/nanomsg');
     assert.dom('[data-test-license]').hasText('Apache-2.0');
 
-    await click('#crate-versions a:contains("0.5.0")');
+    await click('[data-test-version-link="0.5.0"]');
     assert.dom('[data-test-license]').hasText('MIT/Apache-2.0');
 });

tests/acceptance/crate-test.js

@@ -1,4 +1,5 @@
 import { test } from 'qunit';
+import { click, visit, currentURL } from 'ember-native-dom-helpers';
 import moduleForAcceptance from 'cargo/tests/helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | crates page');

tests/acceptance/crates-test.js

@@ -1,4 +1,5 @@
 import { test } from 'qunit';
+import { visit, currentURL } from 'ember-native-dom-helpers';
 import moduleForAcceptance from 'cargo/tests/helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | front page');

tests/acceptance/front-page-test.js

@@ -1,4 +1,5 @@
 import { test } from 'qunit';
+import { visit } from 'ember-native-dom-helpers';
 import moduleForAcceptance from 'cargo/tests/helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | keywords');

tests/acceptance/keyword-test.js

@@ -1,4 +1,5 @@
 import { test } from 'qunit';
+import { fillIn, keyEvent, visit, triggerEvent, currentURL, blur } from 'ember-native-dom-helpers';
 import moduleForAcceptance from 'cargo/tests/helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | search');
@@ -8,10 +9,7 @@ test('searching for "rust"', async function(assert) {
 
     await visit('/');
     await fillIn('[data-test-search-input]', 'rust');
-
-    findWithAssert('[data-test-search-form]').submit();
-
-    await wait();
+    await triggerEvent('[data-test-search-form]', 'submit');
 
     assert.equal(currentURL(), '/search?q=rust');
     assert.equal(document.title, 'Search Results for \'rust\' - Cargo: packages for Rust');
@@ -31,38 +29,27 @@ test('searching for "rust"', async function(assert) {
 test('pressing S key to focus the search bar', async function(assert) {
     server.loadFixtures();
 
-    const KEYCODE_S = 83;
-    const KEYCODE_A = 65;
-
-    function assertSearchBarIsFocused() {
-        assert.dom('[data-test-search-input]').isFocused();
-        find('[data-test-search-input]').blur();
-    }
-
     await visit('/');
 
-    findWithAssert('[data-test-search-input]').blur();
-
-    await keyEvent(document, 'keypress', KEYCODE_A);
+    await blur('[data-test-search-input]');
+    await keyEvent(document, 'keypress', 'a');
     assert.dom('[data-test-search-input]').isNotFocused();
-    find('[data-test-search-input]').blur();
 
-    await keyEvent(document, 'keypress', KEYCODE_S);
-    assertSearchBarIsFocused();
+    await blur('[data-test-search-input]');
+    await keyEvent(document, 'keypress', 's');
+    assert.dom('[data-test-search-input]').isFocused();
 
-    await keyEvent(document, 'keydown', KEYCODE_S);
-    assertSearchBarIsFocused();
+    await blur('[data-test-search-input]');
+    await keyEvent(document, 'keydown', 's');
+    assert.dom('[data-test-search-input]').isFocused();
 });
 
 test('check search results are by default displayed by relevance', async function(assert) {
     server.loadFixtures();
 
     await visit('/');
     await fillIn('[data-test-search-input]', 'rust');
-
-    findWithAssert('[data-test-search-form]').submit();
-
-    await wait();
+    await triggerEvent('[data-test-search-form]', 'submit');
 
     assert.dom('[data-test-search-sort] [data-test-current-order]').hasText('Relevance');
 });

tests/acceptance/search-test.js

@@ -1,4 +1,5 @@
 import { test } from 'qunit';
+import { visit } from 'ember-native-dom-helpers';
 import moduleForAcceptance from 'cargo/tests/helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | team page');

tests/acceptance/team-page-test.js

@@ -1,4 +1,5 @@
 import { test } from 'qunit';
+import { visit } from 'ember-native-dom-helpers';
 import moduleForAcceptance from 'cargo/tests/helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | user page');