Merge pull request #610 from dbendaou/removing-jquery-from-tests

Removing jquery from tests

Author: Turbo87

tests/acceptance/head-test.js

@@ -1,35 +1,39 @@
 import { visit } from '@ember/test-helpers';
 import ENV from 'ember-api-docs/config/environment';
-import $ from 'jquery';
 import { module, test } from 'qunit';
 
 import { setupApplicationTest } from 'ember-qunit';
 
 module('Acceptance | head', function(hooks) {
   setupApplicationTest(hooks);
 
+  hooks.beforeEach(function() {
+    this.head = document.querySelector('head')
+  });
+
   test('no link rel=canonical for release url', async function(assert) {
     await visit('/ember/release/classes/Application');
-    assert.notOk($('head link[rel=canonical]').attr('href'));
+    assert.dom('link[rel=canonical]', this.head).doesNotExist();
   });
 
   test('shows link rel=canonical for version url', async function(assert) {
     await visit('/ember/2.16/classes/Application');
-    assert.ok($('head link[rel=canonical]').attr('href'));
+    assert.dom('link[rel=canonical]', this.head).hasAttribute('href');
   });
 
   test('no link rel=canonical when root url visited', async function(assert) {
     await visit('/');
-    assert.notOk($('head link[rel=canonical]').attr('href'));
+    assert.dom('link[rel=canonical]', this.head).doesNotExist();
+
   });
 
   test('dns prefetch should be populated', async function(assert) {
     await visit('/ember/release/classes/Application');
-    assert.equal($('head link[rel=dns-prefetch]').attr('href'), ENV.API_HOST);
+    assert.dom('link[rel=dns-prefetch]', this.head).hasAttribute('href', ENV.API_HOST);
   });
 
   test('dns prefetch should be populated when root url visited', async function(assert) {
     await visit('/');
-    assert.equal($('head link[rel=dns-prefetch]').attr('href'), ENV.API_HOST);
+    assert.dom('link[rel=dns-prefetch]', this.head).hasAttribute('href', ENV.API_HOST);
   });
 });

tests/acceptance/open-graph-tags-test.js

@@ -1,7 +1,6 @@
 import { visit } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import $ from 'jquery';
 
 module('Acceptance | open graph tags', function(hooks) {
   setupApplicationTest(hooks);
@@ -11,8 +10,8 @@ module('Acceptance | open graph tags', function(hooks) {
   });
 
   function findOpenGraphContent (propertyName) {
-    const el = $(`meta[property="og:${propertyName}"]`);
-    return el.attr('content');
+    const el = document.querySelector(`head meta[property="og:${propertyName}"]`);
+    return el.content;
   }
 
   test('assigns title property', function (assert) {

tests/acceptance/scroll-reset-on-transition-test.js

@@ -1,5 +1,4 @@
 import { visit } from '@ember/test-helpers';
-import $ from 'jquery';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import config from 'ember-api-docs/config/environment';
@@ -9,68 +8,71 @@ const { scrollContainerSelector } = config.APP;
 module('Acceptance | scroll reset on transition', function(hooks) {
   setupApplicationTest(hooks);
 
+  hooks.beforeEach(function() {
+    this.scrollSelector = document.querySelector(scrollContainerSelector);
+  });
+
   test('reset scroll on transitions', async function(assert) {
     await visit('/ember/2.15');
-
-    $(scrollContainerSelector).scrollTop(1000);
-    assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT zero after scroll on fresh visit');
+    this.scrollSelector.scrollTo(0, 1000)
+    assert.notEqual(this.scrollSelector.scrollY, 0, 'scroll position is NOT zero after scroll on fresh visit');
 
     await visit('/ember/1.0/classes/Ember.View');
 
-    assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is zero after transition to different route');
-    $(scrollContainerSelector).scrollTop(1000);
+    assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is zero after transition to different route');
+    this.scrollSelector.scrollTo(0, 1000);
 
     await visit('/ember/1.0/classes/Ember.Component');
 
-    assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project.version.class.index to project-version.class.index (same route different model)');
-    $(scrollContainerSelector).scrollTop(1000);
+    assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is resetted after transition: project.version.class.index to project-version.class.index (same route different model)');
+    this.scrollSelector.scrollTo(0, 1000);
 
     await visit('ember/1.0/modules/ember');
 
-    assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.class.index to project-version.module.index');
-    $(scrollContainerSelector).scrollTop(1000);
+    assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is resetted after transition: project-version.class.index to project-version.module.index');
+    this.scrollSelector.scrollTo(0, 1000);
 
     await visit('ember/1.0/modules/runtime');
 
-    assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.module.index (same route different model)');
-    $(scrollContainerSelector).scrollTop(1000);
+    assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is resetted after transition: project-version.module.index to project-version.module.index (same route different model)');
+    this.scrollSelector.scrollTo(0, 1000);
 
     await visit('ember/1.0/namespaces/Ember');
 
-    assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.namespace.index');
-    $(scrollContainerSelector).scrollTop(1000);
+    assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is resetted after transition: project-version.module.index to project-version.namespace.index');
+    this.scrollSelector.scrollTo(0, 1000);
 
     await visit('ember/1.0/namespaces/Ember.run');
 
-    assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.namespace.index (same route different model)');
-    $(scrollContainerSelector).scrollTop(1000);
+    assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.namespace.index (same route different model)');
+    this.scrollSelector.scrollTo(0, 1000);
 
     await visit('ember/1.0/classes/Ember.RenderBuffer/');
 
-    assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.class.index');
-    $(scrollContainerSelector).scrollTop(1000);
+    assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.class.index');
+    this.scrollSelector.scrollTo(0, 1000);
 
     await visit('ember/1.0/classes/Ember.RenderBuffer/properties');
 
 
-    assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT resetted after changing tab in project-version.class (properties)');
-    $(scrollContainerSelector).scrollTop(1000);
+    assert.notEqual(this.scrollSelector.scrollTop, 0, 'scroll position is NOT resetted after changing tab in project-version.class (properties)');
+    this.scrollSelector.scrollTo(0, 1000);
 
     await visit('ember/1.0/classes/Ember.RenderBuffer/methods');
 
-    assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT resetted after changing tab in project-version.class (methods)');
-    $(scrollContainerSelector).scrollTop(1000);
+    assert.notEqual(this.scrollSelector.scrollTop, 0, 'scroll position is NOT resetted after changing tab in project-version.class (methods)');
+    this.scrollSelector.scrollTo(0, 1000);
 
     await visit('ember/1.0/classes/Ember.Route/methods');
 
-    assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after visiting route with same tab but different model');
+    assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is resetted after visiting route with same tab but different model');
 
     await visit('/ember/2.16');
-    $(scrollContainerSelector).scrollTop(1000);
-    assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT zero after scroll on fresh visit');
+    this.scrollSelector.scrollTo(0, 1000);
+    assert.notEqual(this.scrollSelector.scrollTop, 0, 'scroll position is NOT zero after scroll on fresh visit');
 
     await visit('/ember/2.15/classes/Ember.Error');
 
-    assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is zero after transition to different route');
+    assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is zero after transition to different route');
   });
 });