Skip to content

Commit d293129

Browse files
authored
fix broken ember data index page #635 (#637)
* fix broken ember data index page #635 * add tests for landing page
1 parent cca2a78 commit d293129

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

app/routes/project-version.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,10 @@ export default Route.extend({
4242
// if there is no class, module, or namespace specified...
4343
let latestVersion = getLastVersion(model.get('project.projectVersions'));
4444
let isLatestVersion = transitionVersion === latestVersion || transitionVersion === 'release';
45-
let isEmberProject = model.get('project.id') === 'ember';
4645
let shouldConvertPackages = semverCompare(model.get('version'), '2.16') < 0;
47-
if ((!shouldConvertPackages || isLatestVersion) && isEmberProject) {
48-
// ... and the transition version is the latest release, and the selected docs are
49-
// ember (not Ember Data), then show the landing page
46+
if (!shouldConvertPackages || isLatestVersion) {
47+
// ... and the transition version is the latest release,
48+
// display the landing page at
5049
return this.transitionTo('project-version.index');
5150
} else {
5251
// else go to the version specified

app/templates/project-version/index.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<article class="chapter">
2-
<h1>Ember.js API Documentation</h1>
2+
<h1>Ember API Documentation</h1>
33
<p>
44
To get started, choose a project (Ember or Ember Data) and a version
55
from the dropdown menu. Ember has core methods used in any app, while Ember Data has

tests/acceptance/redirects-test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ module('Acceptance | redirects', function(hooks) {
1212
`/ember/release`,
1313
'routes to the latest version of the project'
1414
);
15-
assert.dom('h1').hasText('Ember.js API Documentation');
15+
assert.dom('h1').hasText('Ember API Documentation');
1616
});
1717

1818
test('visiting /ember-data', async function (assert) {
1919
await visit('/ember-data');
2020
assert.equal(
2121
currentURL(),
22-
`/ember-data/release/modules/ember-data`,
23-
'routes to the first page of ember data'
22+
`/ember-data/release`,
23+
'routes to the landing page'
2424
);
25-
assert.dom('h1').hasText('Package ember-data');
25+
assert.dom('h1').hasText('Ember API Documentation');
2626
});
2727

2828
test('visiting pre-2.16 version', async function(assert) {

0 commit comments

Comments
 (0)