Skip to content

Commit 3c42d0c

Browse files
committed
🔥 removing jquery from scroll-reset-on-transition-test
1 parent 444494e commit 3c42d0c

File tree

1 file changed

+28
-26
lines changed

1 file changed

+28
-26
lines changed
Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { visit } from '@ember/test-helpers';
2-
import $ from 'jquery';
32
import { module, test } from 'qunit';
43
import { setupApplicationTest } from 'ember-qunit';
54
import config from 'ember-api-docs/config/environment';
@@ -9,68 +8,71 @@ const { scrollContainerSelector } = config.APP;
98
module('Acceptance | scroll reset on transition', function(hooks) {
109
setupApplicationTest(hooks);
1110

11+
hooks.beforeEach(function() {
12+
this.scrollSelector = document.querySelector(scrollContainerSelector);
13+
});
14+
1215
test('reset scroll on transitions', async function(assert) {
1316
await visit('/ember/2.15');
14-
15-
$(scrollContainerSelector).scrollTop(1000);
16-
assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT zero after scroll on fresh visit');
17+
this.scrollSelector.scrollTo(0, 1000)
18+
assert.notEqual(this.scrollSelector.scrollY, 0, 'scroll position is NOT zero after scroll on fresh visit');
1719

1820
await visit('/ember/1.0/classes/Ember.View');
1921

20-
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is zero after transition to different route');
21-
$(scrollContainerSelector).scrollTop(1000);
22+
assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is zero after transition to different route');
23+
this.scrollSelector.scrollTo(0, 1000);
2224

2325
await visit('/ember/1.0/classes/Ember.Component');
2426

25-
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project.version.class.index to project-version.class.index (same route different model)');
26-
$(scrollContainerSelector).scrollTop(1000);
27+
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)');
28+
this.scrollSelector.scrollTo(0, 1000);
2729

2830
await visit('ember/1.0/modules/ember');
2931

30-
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.class.index to project-version.module.index');
31-
$(scrollContainerSelector).scrollTop(1000);
32+
assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is resetted after transition: project-version.class.index to project-version.module.index');
33+
this.scrollSelector.scrollTo(0, 1000);
3234

3335
await visit('ember/1.0/modules/runtime');
3436

35-
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.module.index (same route different model)');
36-
$(scrollContainerSelector).scrollTop(1000);
37+
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)');
38+
this.scrollSelector.scrollTo(0, 1000);
3739

3840
await visit('ember/1.0/namespaces/Ember');
3941

40-
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.namespace.index');
41-
$(scrollContainerSelector).scrollTop(1000);
42+
assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is resetted after transition: project-version.module.index to project-version.namespace.index');
43+
this.scrollSelector.scrollTo(0, 1000);
4244

4345
await visit('ember/1.0/namespaces/Ember.run');
4446

45-
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.namespace.index (same route different model)');
46-
$(scrollContainerSelector).scrollTop(1000);
47+
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)');
48+
this.scrollSelector.scrollTo(0, 1000);
4749

4850
await visit('ember/1.0/classes/Ember.RenderBuffer/');
4951

50-
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.class.index');
51-
$(scrollContainerSelector).scrollTop(1000);
52+
assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.class.index');
53+
this.scrollSelector.scrollTo(0, 1000);
5254

5355
await visit('ember/1.0/classes/Ember.RenderBuffer/properties');
5456

5557

56-
assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT resetted after changing tab in project-version.class (properties)');
57-
$(scrollContainerSelector).scrollTop(1000);
58+
assert.notEqual(this.scrollSelector.scrollTop, 0, 'scroll position is NOT resetted after changing tab in project-version.class (properties)');
59+
this.scrollSelector.scrollTo(0, 1000);
5860

5961
await visit('ember/1.0/classes/Ember.RenderBuffer/methods');
6062

61-
assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT resetted after changing tab in project-version.class (methods)');
62-
$(scrollContainerSelector).scrollTop(1000);
63+
assert.notEqual(this.scrollSelector.scrollTop, 0, 'scroll position is NOT resetted after changing tab in project-version.class (methods)');
64+
this.scrollSelector.scrollTo(0, 1000);
6365

6466
await visit('ember/1.0/classes/Ember.Route/methods');
6567

66-
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after visiting route with same tab but different model');
68+
assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is resetted after visiting route with same tab but different model');
6769

6870
await visit('/ember/2.16');
69-
$(scrollContainerSelector).scrollTop(1000);
70-
assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT zero after scroll on fresh visit');
71+
this.scrollSelector.scrollTo(0, 1000);
72+
assert.notEqual(this.scrollSelector.scrollTop, 0, 'scroll position is NOT zero after scroll on fresh visit');
7173

7274
await visit('/ember/2.15/classes/Ember.Error');
7375

74-
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is zero after transition to different route');
76+
assert.equal(this.scrollSelector.scrollTop, 0, 'scroll position is zero after transition to different route');
7577
});
7678
});

0 commit comments

Comments
 (0)