Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Commit

Permalink
Merge pull request #693 from lirantal/feature/clean_angular_hashbang_…
Browse files Browse the repository at this point in the history
…urls

Feature/clean angular hashbang urls
  • Loading branch information
lirantal committed Jul 24, 2015
2 parents e3405d2 + de3b890 commit c671f65
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion modules/articles/tests/e2e/articles.e2e.tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
describe('Articles E2E Tests:', function() {
describe('Test articles page', function() {
it('Should report missing credentials', function() {
browser.get('http://localhost:3000/#!/articles');
browser.get('http://localhost:3000/articles');
expect(element.all(by.repeater('article in articles')).count()).toEqual(0);
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ exports.saveOAuthUserProfile = function (req, providerUserProfile, done) {

// And save the user
user.save(function (err) {
return done(err, user, '/#!/settings/accounts');
return done(err, user, '/settings/accounts');
});
} else {
return done(new Error('User is already connected using this provider'), user);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ exports.validateResetToken = function(req, res) {
}
}, function(err, user) {
if (!user) {
return res.redirect('/#!/password/reset/invalid');
return res.redirect('/password/reset/invalid');
}

res.redirect('/#!/password/reset/' + req.params.token);
res.redirect('/password/reset/' + req.params.token);
});
};

Expand Down
2 changes: 1 addition & 1 deletion modules/users/tests/e2e/users.e2e.tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
describe('Users E2E Tests:', function() {
describe('Signin Validation', function() {
it('Should report missing credentials', function() {
browser.get('http://localhost:3000/#!/authentication/signin');
browser.get('http://localhost:3000/authentication/signin');
element(by.css('button[type=submit]')).click();
element(by.binding('error')).getText().then(function(errorText) {
expect(errorText).toBe('Missing credentials');
Expand Down

0 comments on commit c671f65

Please sign in to comment.