Skip to content

Commit a47e182

Browse files
authored
Merge pull request #861 from ember-learn/fix-tests
skip tests that are broken because of invalid data in production
2 parents e788e6a + b6aa3ed commit a47e182

File tree

2 files changed

+60
-3
lines changed

2 files changed

+60
-3
lines changed

tests/acceptance/function-test.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { visit, find } from '@ember/test-helpers';
55
module('Acceptance | Function', function (hooks) {
66
setupApplicationTest(hooks);
77

8-
test('shows function when loaded from url', async function (assert) {
8+
test.skip('shows function when loaded from url', async function (assert) {
99
await visit('ember/2.18/functions/@ember%2Fapplication/getOwner');
1010

1111
assert.dom('.method').exists({ count: 1 }, 'Single function per page');
@@ -15,4 +15,15 @@ module('Acceptance | Function', function (hooks) {
1515
'Correct function is shown'
1616
);
1717
});
18+
19+
test('shows function when loaded from url in a more modern version', async function (assert) {
20+
await visit('ember/3.28/functions/@ember%2Fapplication/getOwner');
21+
22+
assert.dom('.method').exists({ count: 1 }, 'Single function per page');
23+
assert.equal(
24+
find('.method .method-name').innerText,
25+
'getOwner',
26+
'Correct function is shown'
27+
);
28+
});
1829
});

tests/acceptance/switch-versions-test.js

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ module('Acceptance | version navigation', function (hooks) {
271271
);
272272
});
273273

274-
test('switching versions works if class name includes slashes', async function (assert) {
274+
test.skip('switching versions works if class name includes slashes', async function (assert) {
275275
await visit('/ember/3.4/classes/@ember%2Fobject%2Fcomputed');
276276
assert.equal(
277277
currentURL(),
@@ -287,7 +287,23 @@ module('Acceptance | version navigation', function (hooks) {
287287
);
288288
});
289289

290-
test(`switching versions works if we've previously switched for a different class`, async function (assert) {
290+
test('switching versions works if class name includes slashes for more modern versions', async function (assert) {
291+
await visit('/ember/3.13/classes/@ember%2Fobject%2Fcomputed');
292+
assert.equal(
293+
currentURL(),
294+
'/ember/3.13/classes/@ember%2Fobject%2Fcomputed',
295+
'navigated to v3.13 class'
296+
);
297+
await selectChoose('.ember-power-select-trigger', '3.20');
298+
await waitForSettled();
299+
assert.equal(
300+
currentURL(),
301+
'/ember/3.20/classes/@ember%2Fobject%2Fcomputed',
302+
'navigated to v3.20 class'
303+
);
304+
});
305+
306+
test.skip(`switching versions works if we've previously switched for a different class`, async function (assert) {
291307
await visit('/ember/3.4/classes/@ember%2Fobject%2Fcomputed');
292308
assert.equal(
293309
currentURL(),
@@ -316,6 +332,36 @@ module('Acceptance | version navigation', function (hooks) {
316332
);
317333
});
318334

335+
test(`switching versions works if we've previously switched for a different class (for more modern versions)`, async function (assert) {
336+
await visit('/ember/3.13/classes/@ember%2Fobject%2Fcomputed');
337+
assert.equal(
338+
currentURL(),
339+
'/ember/3.13/classes/@ember%2Fobject%2Fcomputed',
340+
'navigated to v3.13 class'
341+
);
342+
await selectChoose('.ember-power-select-trigger', '3.20');
343+
await waitForSettled();
344+
assert.equal(
345+
currentURL(),
346+
'/ember/3.20/classes/@ember%2Fobject%2Fcomputed',
347+
'navigated to v3.20 class'
348+
);
349+
350+
await visit('/ember/3.25/classes/Component');
351+
assert.equal(
352+
currentURL(),
353+
'/ember/3.25/classes/Component',
354+
'navigated to new class'
355+
);
356+
await selectChoose('.ember-power-select-trigger', '3.15');
357+
await waitForSettled();
358+
assert.equal(
359+
currentURL(),
360+
'/ember/3.15/classes/Component',
361+
'navigated to v3.15 for new class'
362+
);
363+
});
364+
319365
test(`can switch to ember 1.13`, async function (assert) {
320366
await visit('/ember/2.0/classes/Ember.Component');
321367
await waitForSettled();

0 commit comments

Comments
 (0)