Skip to content

Commit f9ded5c

Browse files
authored
Merge pull request #237 from 22a/master
Update 'Edit this page' link regex
2 parents 8534af4 + 53b11a9 commit f9ded5c

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

addon/components/docs-viewer/x-main/component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export default Component.extend({
8080
}
8181
} else {
8282
let file = appFiles
83-
.filter(file => file.match(/template.+(hbs|md)/))
83+
.filter(file => file.match(/\.(hbs|md)$/))
8484
.find(file => file.match(path));
8585

8686
return `${projectHref}/edit/${primaryBranch}/tests/dummy/app/${file}`;

addon/components/docs-viewer/x-main/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="lg:docs-px-4" data-page-index-target>
22
{{yield}}
33

4-
<div class="docs-mt-16 docs-mb-8">
4+
<div class="docs-mt-16 docs-mb-8" data-test-edit-page-link>
55
<a href={{editCurrentPageUrl}}
66
class='docs-transition docs-text-grey-darkest docs-opacity-50 docs-text-sm
77
hover:docs-opacity-75 docs-no-underline docs-border-b docs-border-grey hover:docs-border-grey-darkest'>

tests/acceptance/sandbox/api/components-test.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,12 @@ module('Acceptance | Sandbox | API | components', function(hooks) {
4646
assert.equal(indexItems.length, 13, 'correct number of items rendered');
4747
assert.ok(indexItems.includes('_privateField'), 'private field rendered');
4848
});
49+
50+
test('welcome page \'Edit this page\' link is correct', async function(assert) {
51+
await visit('/sandbox');
52+
53+
const editThisPageLinkHref = await modulePage.editLink.href;
54+
55+
assert.equal(editThisPageLinkHref, 'https://github.com/ember-learn/ember-cli-addon-docs/edit/master/tests/dummy/app/pods/sandbox/index/template.md');
56+
});
4957
});

tests/pages/api/module.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import BaseAddonPage from '../base';
2-
import { collection, text } from 'ember-classy-page-object';
2+
import { attribute, collection, text } from 'ember-classy-page-object';
33

44
const ModulePage = BaseAddonPage.extend({
55
navItems: collection({ scope: '[data-test-id="nav-item"]' }),
@@ -26,6 +26,12 @@ const ModulePage = BaseAddonPage.extend({
2626
})
2727
}),
2828

29+
// eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects
30+
editLink: {
31+
scope: '[data-test-edit-page-link]',
32+
href: attribute('href', 'a'),
33+
},
34+
2935
// eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects
3036
index: {
3137
scope: '[data-test-page-index]',

0 commit comments

Comments
 (0)