From 99d020ece93ee4a92f3617286e97894cf45a52b5 Mon Sep 17 00:00:00 2001 From: Kimberly Lanning Date: Fri, 13 Apr 2012 07:41:52 -0700 Subject: [PATCH] Adds sign up link to home page --- app/views/devise/menu/_login_items.html.erb | 4 ++-- config/routes.rb | 6 +----- spec/requests/users_spec.rb | 12 ++++++------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/views/devise/menu/_login_items.html.erb b/app/views/devise/menu/_login_items.html.erb index 0f2fc5c17..8d434f1e4 100644 --- a/app/views/devise/menu/_login_items.html.erb +++ b/app/views/devise/menu/_login_items.html.erb @@ -4,7 +4,7 @@ <% else %>
  • -
    <%= button_to('Sign In', new_user_session_path) %>
    -
    <%= button_to('Sign Up', new_user_registration_path) %>
    +
    <%= link_to('Sign In', new_user_session_path) %>
    +
    <%= link_to('Sign Up', new_user_registration_path) %>
  • <% end %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 6e2459538..3981c23c8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -21,11 +21,7 @@ match 'events/:id/volunteer', :to => 'events#volunteer', :as => :volunteer match 'events/:id/unvolunteer', :to => 'events#unvolunteer', :as => :unvolunteer - match 'volunteer/search', :to => 'volunteerrsvps#index', :as => :volunteersearch - - devise_scope :user do - match "/users/sign_up", :to => "devise/registrations#new" - end + match 'volunteer/search', :to => 'volunteerrsvps#index', :as => :volunteersearch # Sample resource route (maps HTTP verbs to controller actions automatically): # resources :products diff --git a/spec/requests/users_spec.rb b/spec/requests/users_spec.rb index eef417392..6f62ca20b 100644 --- a/spec/requests/users_spec.rb +++ b/spec/requests/users_spec.rb @@ -7,14 +7,14 @@ @user.confirm! end - it "should see sign in button on the home page" do + it "should see sign in link on the home page" do visit '/' - page.should have_button("Sign In") + page.should have_link("Sign In") end it "should be able to sign in from the home page" do visit '/' - click_button("Sign In") + click_link("Sign In") current_path.should == new_user_session_path end @@ -29,14 +29,14 @@ page.should have_link("Sign Out") end - it "should see sign up button on the home page" do + it "should see sign up link on the home page" do visit '/' - page.should have_button("Sign Up") + page.should have_link("Sign Up") end it "should be able to sign up from the home page" do visit '/' - click_button("Sign Up") + click_link("Sign Up") current_path.should == new_user_registration_path end