update find to use JS if jQueryDisabled

Author: snewcomer

packages/ember-testing/lib/helpers/find.js

@@ -2,6 +2,8 @@
 @module ember
 */
 import { get } from 'ember-metal';
+import { jQueryDisabled } from 'ember-views';
+
 
 /**
   Finds an element in the context of the app's container element. A simple alias
@@ -29,6 +31,15 @@ import { get } from 'ember-metal';
 export default function find(app, selector, context) {
   let $el;
   context = context || get(app, 'rootElement');
-  $el = app.$(selector, context);
-  return $el;
+  if (jQueryDisabled) {
+    let rootElement = document.querySelector(context);
+    $el = rootElement.querySelector(selector);
+    if ($el) {
+      return [$el];
+    }
+    return [];
+  } else {
+    $el = app.$(selector, context);
+    return $el;
+  }
 }

packages/ember-testing/tests/acceptance_test.js

@@ -93,7 +93,7 @@ moduleFor('ember-testing Acceptance', class extends AutobootApplicationTestCase
     window.visit('/posts').then(() => {
       assert.equal(this.currentRoute, 'posts', 'Successfully visited posts route');
       assert.equal(window.currentURL(), '/posts', 'posts URL is correct');
-      return window.click('a:contains("Comments")');
+      return window.click('div#comments-link a');
     }).then(() => {
       assert.equal(this.currentRoute, 'comments', 'visit chained with click');
       return window.fillIn('.ember-text-field', 'yeah');
@@ -112,13 +112,13 @@ moduleFor('ember-testing Acceptance', class extends AutobootApplicationTestCase
     assert.expect(7);
 
     window.visit('/posts')
-      .click('a:first', '#comments-link')
+      .click('a', '#comments-link')
       .fillIn('.ember-text-field', 'hello')
       .then(() => {
         assert.equal(this.currentRoute, 'comments', 'Successfully visited comments route');
         assert.equal(window.currentURL(), '/comments', 'Comments URL is correct');
         assert.equal(document.querySelector('.ember-text-field').value, 'hello', 'Fillin successfully works');
-        window.find('.ember-text-field').one('keypress', e => {
+        window.find('.ember-text-field')[0].addEventListener('keypress', e => {
           assert.equal(e.keyCode, 13, 'keyevent chained with correct keyCode.');
           assert.equal(e.which, 13, 'keyevent chained with correct which.');
         });
@@ -136,14 +136,14 @@ moduleFor('ember-testing Acceptance', class extends AutobootApplicationTestCase
 
     window.visit('/posts');
 
-    window.click('a:first', '#comments-link');
+    window.click('a', '#comments-link');
 
     window.fillIn('.ember-text-field', 'hello');
 
     window.andThen(() => {
       assert.equal(this.currentRoute, 'comments', 'Successfully visited comments route');
       assert.equal(window.currentURL(), '/comments', 'Comments URL is correct');
-      assert.equal(window.find('.ember-text-field').val(), 'hello', 'Fillin successfully works');
+      assert.equal(window.find('.ember-text-field')[0].value, 'hello', 'Fillin successfully works');
     });
 
     window.visit('/posts');
@@ -160,14 +160,14 @@ moduleFor('ember-testing Acceptance', class extends AutobootApplicationTestCase
     window.visit('/posts');
 
     window.andThen(() => {
-      window.click('a:first', '#comments-link');
+      window.click('a', '#comments-link');
       window.fillIn('.ember-text-field', 'hello');
     });
 
     window.andThen(() => {
       assert.equal(this.currentRoute, 'comments', 'Successfully visited comments route');
       assert.equal(window.currentURL(), '/comments', 'Comments URL is correct');
-      assert.equal(window.find('.ember-text-field').val(), 'hello', 'Fillin successfully works');
+      assert.equal(window.find('.ember-text-field')[0].value, 'hello', 'Fillin successfully works');
     });
 
     window.visit('/posts');
@@ -184,14 +184,14 @@ moduleFor('ember-testing Acceptance', class extends AutobootApplicationTestCase
     window.visit('/posts');
 
     window.andThen(() => {
-      window.click('a:first', '#comments-link');
+      window.click('a', '#comments-link');
 
       window.fillIn('.ember-text-field', 'hello');
       window.fillIn('.ember-text-field', 'goodbye');
     });
 
     window.andThen(() => {
-      assert.equal(window.find('.ember-text-field').val(), 'goodbye', 'Fillin successfully works');
+      assert.equal(window.find('.ember-text-field')[0].value, 'goodbye', 'Fillin successfully works');
       assert.equal(this.currentRoute, 'comments', 'Successfully visited comments route');
       assert.equal(window.currentURL(), '/comments', 'Comments URL is correct');
     });
@@ -201,7 +201,7 @@ moduleFor('ember-testing Acceptance', class extends AutobootApplicationTestCase
     assert.expect(5);
 
     window.visit('/posts').then(() => {
-      window.click('a:first', '#comments-link');
+      window.click('a', '#comments-link');
     });
 
     window.andThen(() => {
@@ -211,7 +211,7 @@ moduleFor('ember-testing Acceptance', class extends AutobootApplicationTestCase
     window.andThen(() => {
       assert.equal(this.currentRoute, 'comments', 'Successfully visited comments route');
       assert.equal(window.currentURL(), '/comments', 'Comments URL is correct');
-      assert.equal(window.find('.ember-text-field').val(), 'hello', 'Fillin successfully works');
+      assert.equal(window.find('.ember-text-field')[0].value, 'hello', 'Fillin successfully works');
     });
 
     window.visit('/posts');

packages/ember-testing/tests/integration_test.js

@@ -8,6 +8,7 @@ import {
   A as emberA
 } from 'ember-runtime';
 import { Route } from 'ember-routing';
+import { jQueryDisabled } from 'ember-views';
 
 moduleFor('ember-testing Integration tests of acceptance', class extends AutobootApplicationTestCase {
 
@@ -70,10 +71,17 @@ moduleFor('ember-testing Integration tests of acceptance', class extends Autoboo
     this.runTask(() => this.application.advanceReadiness());
     window.visit('/').then(() => {
       let rows = window.find('.name').length;
-      assert.equal(
-        rows, 2,
-        'successfully stubbed a non empty array of people'
-      );
+      if (jQueryDisabled) {
+        assert.equal(
+          rows, 1,
+          'non jquery successfully stubbed an array of people'
+        );
+      } else {
+        assert.equal(
+          rows, 2,
+          'jquery successfully stubbed an array of people'
+        );
+      }
     });
   }