TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-29 15:12:58 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #52 from kevinansfield/deps-ember

Browse Source 
deps: ember@2.6.0
This commit is contained in:
Austin Burdine 2016-06-09 10:39:05 -06:00
commit 089226330b
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/admin/app/utils/ghost-paths.js
View File

@ -16,7 +16,7 @@ let makeRoute = function (root, args) {
export default function () {
let path = window.location.pathname;
let subdir = path.substr(0, path.search('/ghost/'));
let adminRoot = `${subdir}/ghost`;
let adminRoot = `${subdir}/ghost/`;
let apiRoot = `${subdir}/ghost/api/v0.1`;
function assetUrl(src) {

2
ghost/admin/bower.json
View File

@ -4,7 +4,7 @@
"blueimp-md5": "2.3.0",
"codemirror": "5.15.2",
"devicejs": "0.2.7",
"ember": "2.5.1",
"ember": "2.6.0",
"ember-cli-shims": "0.1.1",
"ember-cli-test-loader": "0.2.2",
"ember-mocha": "0.8.11",

12
ghost/admin/tests/acceptance/settings/tags-test.js
View File

@ -111,7 +111,7 @@ describe('Acceptance: Settings - Tags', function () {
.to.equal(tag1.name);
// it highlights selected tag
expect(find(`a[href="/settings/tags/${tag1.slug}"]`).hasClass('active'), 'highlights selected tag')
expect(find(`a[href="/ghost/settings/tags/${tag1.slug}"]`).hasClass('active'), 'highlights selected tag')
.to.be.true;
// it shows selected tag form
@ -129,7 +129,7 @@ describe('Acceptance: Settings - Tags', function () {
expect(currentURL(), 'url after clicking tag').to.equal(`/settings/tags/${tag2.slug}`);
// it highlights selected tag
expect(find(`a[href="/settings/tags/${tag2.slug}"]`).hasClass('active'), 'highlights selected tag')
expect(find(`a[href="/ghost/settings/tags/${tag2.slug}"]`).hasClass('active'), 'highlights selected tag')
.to.be.true;
// it shows selected tag form
@ -150,7 +150,7 @@ describe('Acceptance: Settings - Tags', function () {
expect(currentURL(), 'url after keyboard up arrow').to.equal(`/settings/tags/${tag1.slug}`);
// it highlights selected tag
expect(find(`a[href="/settings/tags/${tag1.slug}"]`).hasClass('active'), 'selects previous tag')
expect(find(`a[href="/ghost/settings/tags/${tag1.slug}"]`).hasClass('active'), 'selects previous tag')
.to.be.true;
});
@ -167,7 +167,7 @@ describe('Acceptance: Settings - Tags', function () {
expect(currentURL(), 'url after keyboard down arrow').to.equal(`/settings/tags/${tag2.slug}`);
// it highlights selected tag
expect(find(`a[href="/settings/tags/${tag2.slug}"]`).hasClass('active'), 'selects next tag')
expect(find(`a[href="/ghost/settings/tags/${tag2.slug}"]`).hasClass('active'), 'selects next tag')
.to.be.true;
});
@ -213,7 +213,7 @@ describe('Acceptance: Settings - Tags', function () {
.to.equal(3);
expect(find('.settings-tags .settings-tag:last .tag-title').text(), 'new tag list item title')
.to.equal('New Tag');
expect(find('a[href="/settings/tags/new-tag"]').hasClass('active'), 'highlights new tag')
expect(find('a[href="/ghost/settings/tags/new-tag"]').hasClass('active'), 'highlights new tag')
.to.be.true;
});
@ -244,7 +244,7 @@ describe('Acceptance: Settings - Tags', function () {
.to.equal(2);
// selects tag in list
expect(find('a[href="/settings/tags/tag-1"]').hasClass('active'), 'highlights requested tag')
expect(find('a[href="/ghost/settings/tags/tag-1"]').hasClass('active'), 'highlights requested tag')
.to.be.true;
// shows requested tag in settings pane

2
ghost/admin/tests/acceptance/team-test.js
View File

@ -98,7 +98,7 @@ describe('Acceptance: Team', function () {
expect(document.title, 'title after clicking user').to.equal('Team - User - Test Blog');
// view title should exist and be linkable and active
expect(find('.view-title a[href="/team"]').hasClass('active'), 'has linkable url back to team main page')
expect(find('.view-title a[href="/ghost/team"]').hasClass('active'), 'has linkable url back to team main page')
.to.be.true;
});