Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/routes/whats-new.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ function checkStatus(response) {
}

function getLatestEntry(doc) {
const regex =
/^#{2} (?:v(\d{1,2}(?:\.\d{1,2})?(?:\.\d{1,2})?)|(?:\[v?(.+)]))/gm;
const regex = /^## Release /gm;
const latest = regex.exec(doc);
const previous = regex.exec(doc);

Expand All @@ -42,7 +41,8 @@ export default class WhatsNewRoute extends TabRoute {
model() {
let { version } = this.config;

let ref = version.indexOf('alpha') === -1 ? `v${version}` : 'main';
let ref =
version.indexOf('alpha') === -1 ? `v${version}` : 'release-preview';
let url = `https://raw.githubusercontent.com/emberjs/ember-inspector/${encodeURIComponent(
ref,
)}-ember-inspector/CHANGELOG.md`;
Expand Down
12 changes: 6 additions & 6 deletions tests/acceptance/whats-new-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ function generateContent(main = false) {

if (main) {
content.push(`
## [Unreleased](https://github.com/emberjs/ember-inspector/tree/HEAD)
## Release [Unreleased](https://github.com/emberjs/ember-inspector/tree/HEAD)

**Merged pull requests:**

- Stuff`);
}

content.push(`
## v4.5.3 (2021-11-18)
## Release (2021-11-18)

[Full Changelog](https://emberjs.com)

**Implemented enhancements:**

- Stuff

## v4.5.2 (2021-11-17)
## Release (2021-11-17)

[Full Changelog](https://emberjs.com)

Expand Down Expand Up @@ -91,7 +91,7 @@ module('Whats New', function (outer) {

assert.strictEqual(
find('.whats-new h2').textContent,
'v4.5.3 (2021-11-18)',
'Release (2021-11-18)',
'correct section of markdown is rendered',
);
});
Expand All @@ -116,7 +116,7 @@ module('Whats New', function (outer) {

test('Changelog is parsed and displayed', async function (assert) {
this.server = new Pretender(function () {
this.get(urlFor('main'), () => [
this.get(urlFor('release-preview'), () => [
200,
{ 'Content-Type': 'text/plain' },
generateContent(true),
Expand All @@ -138,7 +138,7 @@ module('Whats New', function (outer) {

test('Error message is displayed on request failure', async function (assert) {
this.server = new Pretender(function () {
this.get(urlFor('main'), () => [404, {}, '']);
this.get(urlFor('release-preview'), () => [404, {}, '']);
});

await visit('/info/whats-new');
Expand Down