Skip to content

Commit

Permalink
Fixed signup
Browse files Browse the repository at this point in the history
  • Loading branch information
joscas committed May 2, 2013
1 parent 8eb7c71 commit 36d98bf
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 111 deletions.
8 changes: 4 additions & 4 deletions app/assets/javascripts/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BaseApp.Auth = Ember.Auth.create({
'rememberable',
'authRedirectable',
'actionRedirectable',
'urlAuthenticatable'
//'urlAuthenticatable'
],
signInEndPoint: '/users/sign_in',
signOutEndPoint: '/users/sign_out',
Expand All @@ -22,7 +22,7 @@ BaseApp.Auth = Ember.Auth.create({
signInRoute: 'home',
signOutRoute: 'home'
},
urlAuthenticatable: {
paramsKey: 'auth'
}
// urlAuthenticatable: {
// paramsKey: 'auth'
// }
});
8 changes: 5 additions & 3 deletions app/assets/javascripts/controllers/users/new_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ BaseApp.UsersNewController = Ember.ObjectController.extend({
// when creating new records, it's necessary to wait for the record to be assigned
// an id before we can transition to its route (which depends on its id)
if (this.get('content.id')) {
Auth.signIn({
email: this.get('email'),
password: this.get('password')
BaseApp.Auth.signIn({
data: {
'email': this.get('email'),
'password': this.get('password'),
}
});
this.content.set('validationError',false);
this.content.set('validationErrors',{});
Expand Down
62 changes: 31 additions & 31 deletions coverage/.resultset.json
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@
null
]
},
"timestamp": 1367511481
"timestamp": 1367517738
},
"Cucumber Features": {
"coverage": {
Expand Down Expand Up @@ -589,7 +589,7 @@
1,
null,
1,
6,
7,
0,
null,
null,
Expand Down Expand Up @@ -632,25 +632,25 @@
1,
null,
1,
0,
0,
0,
0,
4,
4,
3,
3,
null,
null,
0,
1,
null,
null,
null,
null,
1,
0,
0,
0,
3,
3,
1,
null,
null,
0,
0,
2,
2,
null,
null,
null,
Expand All @@ -660,8 +660,8 @@
1,
null,
1,
7,
6,
11,
10,
null,
1,
null,
Expand All @@ -670,28 +670,28 @@
0,
null,
null,
7,
11,
null,
6,
6,
10,
10,
null,
null,
null,
6,
10,
1,
1,
null,
6,
10,
null,
null,
1,
1,
2,
null,
1,
1,
2,
2,
null,
1,
1,
2,
2,
null,
null,
1,
Expand All @@ -718,10 +718,10 @@
null,
null,
1,
6,
6,
5,
5,
10,
10,
9,
9,
null,
null,
null,
Expand All @@ -739,7 +739,7 @@
null,
null,
1,
6,
7,
null,
null
],
Expand All @@ -748,11 +748,11 @@
1,
null,
1,
6,
11,
null,
null
]
},
"timestamp": 1367511635
"timestamp": 1367517806
}
}

0 comments on commit 36d98bf

Please sign in to comment.