removed /#! in user controllers

Resolved 0.4.0 related conflicts: modules/users/server/controllers/users/users.authentication.server.controller.js
meanjs · Jul 24, 2015 · de3b890 · de3b890
1 parent 29d264d
commit de3b890
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/modules/articles/tests/e2e/articles.e2e.tests.js b/modules/articles/tests/e2e/articles.e2e.tests.js
@@ -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);
 		});
 	});

diff --git a/modules/users/server/controllers/users/users.authentication.server.controller.js b/modules/users/server/controllers/users/users.authentication.server.controller.js
@@ -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);

diff --git a/modules/users/server/controllers/users/users.password.server.controller.js b/modules/users/server/controllers/users/users.password.server.controller.js
@@ -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);
 	});
 };
 

diff --git a/modules/users/tests/e2e/users.e2e.tests.js b/modules/users/tests/e2e/users.e2e.tests.js
@@ -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');