username -> email

2 files changed, 9 insertions, 9 deletions

diff --git a/spec/javascripts/models/session_spec.js.coffee b/spec/javascripts/models/session_spec.js.coffee
index d58e8c25..9e5ef7be 100644
--- a/spec/javascripts/models/session_spec.js.coffee
+++ b/spec/javascripts/models/session_spec.js.coffee
@@ -8,14 +8,14 @@ describe "CakeSide.Models.Session", ->
     expectedError = "Email can't be blank"
 
     expect(subject.isValid()).toEqual(false)
-    expect(subject.validationError['username']).toEqual(expectedError)
+    expect(subject.validationError['email']).toEqual(expectedError)
 
   it "is invalid, when the email is not a valid email addrees", ->
-    subject.set('username', 'blah')
+    subject.set('email', 'blah')
     expectedError = "Email is invalid"
 
     expect(subject.isValid()).toEqual(false)
-    expect(subject.validationError['username']).toEqual(expectedError)
+    expect(subject.validationError['email']).toEqual(expectedError)
 
   it "is invalid, when the password is missing", ->
     expectedError = "Password can't be blank"
@@ -24,7 +24,7 @@ describe "CakeSide.Models.Session", ->
     expect(subject.validationError['password']).toEqual(expectedError)
 
   it "is valid", ->
-    subject.set('username', 'test@example.com')
+    subject.set('email', 'test@example.com')
     subject.set('password', 'password')
     expect(subject.isValid()).toEqual(true)
     expect(subject.validationError).toEqual(null)
diff --git a/spec/javascripts/views/sessions/login_form_spec.js.coffee b/spec/javascripts/views/sessions/login_form_spec.js.coffee
index 4999bc55..5a619097 100644
--- a/spec/javascripts/views/sessions/login_form_spec.js.coffee
+++ b/spec/javascripts/views/sessions/login_form_spec.js.coffee
@@ -8,7 +8,7 @@ describe "CakeSide.Views.LoginForm", ->
     <input name="utf8" type="hidden" value="✓">
     <input type="hidden" name="authenticity_token" value="NUk9vz3sVMzi09PgQrzOTDcJIki2RgCzHgtpFw0ooSha4lgMt/bUsuAk//Wvi7wb/K6qh+pVrDkKr5a5e66QTw==">
     <div class="form-group">
-      <input type="email" name="session[username]" id="session_username" value="" placeholder="Email" class="form-control" required="required">
+      <input type="email" name="session[email]" id="session_email" value="" placeholder="Email" class="form-control" required="required">
       <div class="invalid-feedback"></div>
     </div>
     <div class="form-group">
@@ -28,19 +28,19 @@ describe "CakeSide.Views.LoginForm", ->
     subject.$('form').submit()
 
     expect(subject.$('input[type=submit]').prop('disabled')).toEqual(true)
-    expect(subject.field('username').siblings('.invalid-feedback').html()).toEqual("Email can't be blank")
+    expect(subject.field('email').siblings('.invalid-feedback').html()).toEqual("Email can't be blank")
 
   it "disables the submit button when the password is missing", ->
-    subject.field('username').val('user@email.com')
+    subject.field('email').val('user@email.com')
     subject.$('form').submit()
 
     expect(subject.$('input[type=submit]').prop('disabled')).toEqual(true)
     expect(subject.field("password").siblings('.invalid-feedback').html()).toEqual("Password can't be blank")
 
   it "enables the submit button when all required fields are specified", ->
-    subject.field('username').val('user@email.com').change()
+    subject.field('email').val('user@email.com').change()
     subject.field('password').val('password').change()
 
     expect(subject.$('input[type=submit]').prop('disabled')).toEqual(false)
-    expect(subject.field('username').siblings('.invalid-feedback').html()).toEqual('')
+    expect(subject.field('email').siblings('.invalid-feedback').html()).toEqual('')
     expect(subject.field('password').siblings('.invalid-feedback').html()).toEqual('')