-
-
Notifications
You must be signed in to change notification settings - Fork 10.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6061 from kevinansfield/fix-auth-regressions
Fix auth regressions after ESA 1.0 upgrade
- Loading branch information
Showing
16 changed files
with
273 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
/* jscs:disable */ | ||
import Mirage from 'ember-cli-mirage'; | ||
|
||
export default Mirage.Factory.extend({ | ||
// TODO: fill in with actual factory data | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
export default { | ||
changeLocation: function (url) { | ||
window.location = url; | ||
}, | ||
|
||
replaceLocation: function (url) { | ||
window.location.replace(url); | ||
} | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,132 @@ | ||
/* jshint expr:true */ | ||
import { | ||
describe, | ||
it, | ||
beforeEach, | ||
afterEach | ||
} from 'mocha'; | ||
import { expect } from 'chai'; | ||
import Ember from 'ember'; | ||
import startApp from '../helpers/start-app'; | ||
import { authenticateSession, currentSession, invalidateSession } from 'ghost/tests/helpers/ember-simple-auth'; | ||
import Mirage from 'ember-cli-mirage'; | ||
import windowProxy from 'ghost/utils/window-proxy'; | ||
|
||
const {run} = Ember; | ||
|
||
describe('Acceptance: Authentication', function () { | ||
let application, | ||
originalReplaceLocation; | ||
|
||
beforeEach(function () { | ||
application = startApp(); | ||
}); | ||
|
||
afterEach(function () { | ||
run(application, 'destroy'); | ||
}); | ||
|
||
describe('general page', function () { | ||
beforeEach(function () { | ||
originalReplaceLocation = windowProxy.replaceLocation; | ||
windowProxy.replaceLocation = function (url) { | ||
visit(url); | ||
}; | ||
|
||
server.loadFixtures(); | ||
const role = server.create('role', {name: 'Administrator'}), | ||
user = server.create('user', {roles: [role], slug: 'test-user'}); | ||
}); | ||
|
||
afterEach(function () { | ||
windowProxy.replaceLocation = originalReplaceLocation; | ||
}); | ||
|
||
it('invalidates session on 401 API response', function () { | ||
const role = server.create('role', {name: 'Administrator'}), | ||
user = server.create('user', {roles: [role]}); | ||
|
||
// return a 401 when attempting to retrieve tags | ||
server.get('/users/', (db, request) => { | ||
return new Mirage.Response(401, {}, { | ||
errors: [ | ||
{message: 'Access denied.', errorType: 'UnauthorizedError'} | ||
] | ||
}); | ||
}); | ||
|
||
authenticateSession(application); | ||
visit('/team'); | ||
|
||
andThen(() => { | ||
expect(currentURL(), 'url after 401').to.equal('/signin'); | ||
}); | ||
}); | ||
}); | ||
|
||
describe('editor', function () { | ||
let origDebounce = Ember.run.debounce; | ||
let origThrottle = Ember.run.throttle; | ||
|
||
// we don't want the autosave interfering in this test | ||
beforeEach(function () { | ||
Ember.run.debounce = function () { }; | ||
Ember.run.throttle = function () { }; | ||
}); | ||
|
||
it('displays re-auth modal attempting to save with invalid session', function () { | ||
const role = server.create('role', {name: 'Administrator'}), | ||
user = server.create('user', {roles: [role]}); | ||
|
||
// simulate an invalid session when saving the edited post | ||
server.put('/posts/:id/', (db, request) => { | ||
let post = db.posts.find(request.params.id), | ||
[attrs] = JSON.parse(request.requestBody).posts; | ||
|
||
if (attrs.markdown === 'Edited post body') { | ||
return new Mirage.Response(401, {}, { | ||
errors: [ | ||
{message: 'Access denied.', errorType: 'UnauthorizedError'} | ||
] | ||
}); | ||
} else { | ||
return { | ||
posts: [post] | ||
}; | ||
} | ||
}); | ||
|
||
server.loadFixtures(); | ||
authenticateSession(application); | ||
|
||
visit('/editor'); | ||
|
||
// create the post | ||
fillIn('#entry-title', 'Test Post'); | ||
fillIn('textarea.markdown-editor', 'Test post body'); | ||
click('.js-publish-button'); | ||
|
||
andThen(() => { | ||
// we shouldn't have a modal at this point | ||
expect(find('.modal-container #login').length, 'modal exists').to.equal(0); | ||
// we also shouldn't have any alerts | ||
expect(find('.gh-alert').length, 'no of alerts').to.equal(0); | ||
}); | ||
|
||
// update the post | ||
fillIn('textarea.markdown-editor', 'Edited post body'); | ||
click('.js-publish-button'); | ||
|
||
andThen(() => { | ||
// we should see a re-auth modal | ||
expect(find('.modal-container #login').length, 'modal exists').to.equal(1); | ||
}); | ||
}); | ||
|
||
// don't clobber debounce/throttle for future tests | ||
afterEach(function () { | ||
Ember.run.debounce = origDebounce; | ||
Ember.run.throttle = origThrottle; | ||
}); | ||
}); | ||
}); |
Oops, something went wrong.