From a8a0c0513ec248fd6811738f15d3b89b682f038f Mon Sep 17 00:00:00 2001 From: alexs Date: Wed, 14 Aug 2013 11:12:36 +1000 Subject: [PATCH] Fixed id duplication for login and sign up forms. --- app/views/home/_login.html.haml | 6 +++--- app/views/home/_signup.html.haml | 6 +++--- spec/features/consumer/landing_page_spec.rb | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/home/_login.html.haml b/app/views/home/_login.html.haml index ddc9a3f6b1..e5b9aa5c20 100644 --- a/app/views/home/_login.html.haml +++ b/app/views/home/_login.html.haml @@ -7,12 +7,12 @@ Invalid email or password %p = f.label :email, t(:email) - = f.email_field :email, :class => 'title', :tabindex => 1 + = f.email_field :email, :class => 'title', :tabindex => 1, :id => "login_spree_user_email" %p = f.label :password, t(:password) - = f.password_field :password, :class => 'title', :tabindex => 2 + = f.password_field :password, :class => 'title', :tabindex => 2, :id => "login_spree_user_password" %p %label = f.check_box :remember_me = f.label :remember_me, t(:remember_me) - %p= f.submit t(:login), :class => 'button primary', :tabindex => 3 \ No newline at end of file + %p= f.submit t(:login), :class => 'button primary', :tabindex => 3, :id => "login_spree_user_remember_me" \ No newline at end of file diff --git a/app/views/home/_signup.html.haml b/app/views/home/_signup.html.haml index 5c8284b485..33eaff94d0 100644 --- a/app/views/home/_signup.html.haml +++ b/app/views/home/_signup.html.haml @@ -4,14 +4,14 @@ = form_for Spree::User.new, :as => :spree_user, :url => spree.spree_user_registration_path(@spree_user) do |f| %p = f.label :email, t(:email) - = f.email_field :email, :class => 'title' + = f.email_field :email, :class => 'title', :id => "signup_spree_user_email" #password-credentials %p = f.label :password, t(:password) - = f.password_field :password, :class => 'title' + = f.password_field :password, :class => 'title', :id => "signup_spree_user_password" %p = f.label :password_confirmation, t(:confirm_password) - = f.password_field :password_confirmation, :class => 'title' + = f.password_field :password_confirmation, :class => 'title', :id => "signup_spree_user_password_confirmation" = f.submit t(:create), :class => 'button' diff --git a/spec/features/consumer/landing_page_spec.rb b/spec/features/consumer/landing_page_spec.rb index 68d9c7cd2f..de6a971282 100644 --- a/spec/features/consumer/landing_page_spec.rb +++ b/spec/features/consumer/landing_page_spec.rb @@ -24,8 +24,8 @@ feature %q{ end scenario "with valid credentials" do - fill_in 'spree_user_email', :with => 'spree123@example.com' - fill_in 'spree_user_password', :with => 'spree123' + fill_in 'login_spree_user_email', :with => 'spree123@example.com' + fill_in 'login_spree_user_password', :with => 'spree123' find(:xpath, '//input[contains(@value, "Login")][contains(@type, "submit")]').click sleep 3 page.should_not have_content("Invalid email or password") @@ -33,8 +33,8 @@ feature %q{ end scenario "with invalid credentials" do - fill_in 'spree_user_email', :with => 'spree123@example.com.WRONG' - fill_in 'spree_user_password', :with => 'spree123_WRONG' + fill_in 'login_spree_user_email', :with => 'spree123@example.com.WRONG' + fill_in 'login_spree_user_password', :with => 'spree123_WRONG' find(:xpath, '//input[contains(@value, "Login")][contains(@type, "submit")]').click sleep 3 page.should have_content("Invalid email or password")