Skip to content

Commit 75c940d

Browse files
Fix tests
1 parent 8d7c84a commit 75c940d

File tree

6 files changed

+773
-1031
lines changed

6 files changed

+773
-1031
lines changed

addon/components/docs-header/search-result/component.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,4 @@ export default Component.extend({
132132
start + length
133133
)}</span>${text.slice(start + length)}`;
134134
},
135-
136-
'data-test-search-result': true,
137135
});

addon/components/docs-header/search-result/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{! template-lint-disable no-unknown-arguments-for-builtin-components }}
2-
<div {{on 'click' this.onClick}} {{on 'mouseenter' this.onMouseEnter}}>
2+
<div {{on 'click' this.onClick}} {{on 'mouseenter' this.onMouseEnter}} data-test-search-result>
33
<LinkTo
44
class={{
55
concat

addon/routes/docs.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import Route from '@ember/routing/route';
2+
import { inject as service } from '@ember/service';
23
import config from 'ember-get-config';
34

45
const projectName = config['ember-cli-addon-docs'].projectName;
56

6-
export default Route.extend({
7+
export default class DocsRoute extends Route {
8+
@service store;
9+
710
model() {
811
return this.store.findRecord('project', projectName);
9-
},
10-
});
12+
}
13+
}

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
},
3333
"resolutions": {
3434
"**/ember-cli-babel": "^7.26.6",
35+
"**/@ember/string": "^3.0.0",
3536
"**/@ember/render-modifiers": "cibernox/ember-render-modifiers#e3574ed03409ef7a048d7716b8bea361ed6cd6e2",
3637
"**/ember-tether": "^2.0.1",
3738
"**/tough-cookie": "~2.4.0"
@@ -126,14 +127,14 @@
126127
"ember-cli-sri": "^2.1.1",
127128
"ember-cli-terser": "^4.0.2",
128129
"ember-component-css": "^0.7.4",
129-
"ember-data": "~3.27.0",
130+
"ember-data": "~3.28.0",
130131
"ember-disable-prototype-extensions": "^1.1.3",
131132
"ember-export-application-global": "^2.0.1",
132133
"ember-load-initializers": "^2.1.2",
133134
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
134135
"ember-page-title": "^6.2.2",
135136
"ember-qunit": "^5.1.4",
136-
"ember-resolver": "^8.0.2",
137+
"ember-resolver": "^8.0.3",
137138
"ember-source": "~3.28.0",
138139
"ember-source-channel-url": "^3.0.0",
139140
"ember-template-lint": "^3.6.0",
@@ -164,6 +165,9 @@
164165
"publishConfig": {
165166
"registry": "https://registry.npmjs.org"
166167
},
168+
"ember": {
169+
"edition": "octane"
170+
},
167171
"ember-addon": {
168172
"configPath": "tests/dummy/config",
169173
"before": [

tests/acceptance/search-test.js

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,45 @@
1-
import { module, skip } from 'qunit';
1+
import { module, test } from 'qunit';
22
import { setupApplicationTest } from 'ember-qunit';
33
import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
4-
import { visit, click, find, waitUntil, currentURL } from '@ember/test-helpers';
5-
6-
import appPage from '../pages/app';
4+
import {
5+
click,
6+
currentURL,
7+
fillIn,
8+
find,
9+
findAll,
10+
visit,
11+
waitUntil,
12+
} from '@ember/test-helpers';
713

814
module('Acceptance | Search', function (hooks) {
915
setupApplicationTest(hooks);
1016
setupMirage(hooks);
1117

12-
skip('search works for guides pages', async function (assert) {
18+
test('search works for guides pages', async function (assert) {
1319
await visit('/');
14-
await appPage.fillInSearchQuery('quickstart');
20+
await fillIn('[data-test-search-box-input]', 'quickstart');
1521

16-
await waitUntil(() => appPage.searchResults.items.length > 0);
22+
await waitUntil(
23+
function () {
24+
return findAll('[data-test-search-result]').length > 0;
25+
},
26+
{ timeout: 2000 }
27+
);
1728

1829
await click(find('[data-test-search-result] a'));
1930
assert.equal(currentURL(), '/docs/quickstart');
2031
});
2132

22-
skip('search works for API pages', async function (assert) {
33+
test('search works for API pages', async function (assert) {
2334
await visit('/');
24-
await appPage.fillInSearchQuery('hero');
25-
26-
await waitUntil(() => appPage.searchResults.items.length > 0);
35+
await fillIn('[data-test-search-box-input]', 'hero');
36+
37+
await waitUntil(
38+
function () {
39+
return findAll('[data-test-search-result]').length > 0;
40+
},
41+
{ timeout: 2000 }
42+
);
2743

2844
await click(find('[data-test-search-result] a'));
2945
assert.equal(currentURL(), '/docs/api/components/docs-hero');

0 commit comments

Comments
 (0)