From 8ae5ab7bd52d78bfcd7d2e9f0c2431778ed966d3 Mon Sep 17 00:00:00 2001 From: mo Date: Fri, 8 Sep 2017 21:13:29 -0600 Subject: username -> email --- spec/javascripts/models/session_spec.js.coffee | 8 ++++---- spec/javascripts/views/sessions/login_form_spec.js.coffee | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'spec/javascripts') 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", ->
- +
@@ -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('') -- cgit v1.2.3