Skip to content

Commit c15e2a9

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

File tree

1 file changed

+25
-26
lines changed

1 file changed

+25
-26
lines changed
Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,75 @@
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';
65

76
const { scrollContainerSelector } = config.APP;
7+
const scrollSelector = document.querySelector(scrollContainerSelector);
88

99
module('Acceptance | scroll reset on transition', function(hooks) {
1010
setupApplicationTest(hooks);
1111

1212
test('reset scroll on transitions', async function(assert) {
1313
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');
14+
scrollSelector.scrollTo(0, 1000)
15+
assert.notEqual(scrollSelector.scrollY, 0, 'scroll position is NOT zero after scroll on fresh visit');
1716

1817
await visit('/ember/1.0/classes/Ember.View');
1918

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

2322
await visit('/ember/1.0/classes/Ember.Component');
2423

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

2827
await visit('ember/1.0/modules/ember');
2928

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);
29+
assert.equal(scrollSelector.scrollTop, 0, 'scroll position is resetted after transition: project-version.class.index to project-version.module.index');
30+
scrollSelector.scrollTo(0, 1000);
3231

3332
await visit('ember/1.0/modules/runtime');
3433

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

3837
await visit('ember/1.0/namespaces/Ember');
3938

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);
39+
assert.equal(scrollSelector.scrollTop, 0, 'scroll position is resetted after transition: project-version.module.index to project-version.namespace.index');
40+
scrollSelector.scrollTo(0, 1000);
4241

4342
await visit('ember/1.0/namespaces/Ember.run');
4443

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

4847
await visit('ember/1.0/classes/Ember.RenderBuffer/');
4948

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);
49+
assert.equal(scrollSelector.scrollTop, 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.class.index');
50+
scrollSelector.scrollTo(0, 1000);
5251

5352
await visit('ember/1.0/classes/Ember.RenderBuffer/properties');
5453

5554

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

5958
await visit('ember/1.0/classes/Ember.RenderBuffer/methods');
6059

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

6463
await visit('ember/1.0/classes/Ember.Route/methods');
6564

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

6867
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');
68+
scrollSelector.scrollTo(0, 1000);
69+
assert.notEqual(scrollSelector.scrollTop, 0, 'scroll position is NOT zero after scroll on fresh visit');
7170

7271
await visit('/ember/2.15/classes/Ember.Error');
7372

74-
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is zero after transition to different route');
73+
assert.equal(scrollSelector.scrollTop, 0, 'scroll position is zero after transition to different route');
7574
});
7675
});

0 commit comments

Comments
 (0)