diff --git a/app/views/feedback_forms/new.html.erb b/app/views/feedback_forms/_new.html.erb similarity index 100% rename from app/views/feedback_forms/new.html.erb rename to app/views/feedback_forms/_new.html.erb diff --git a/app/views/shared/_sul_header.html.erb b/app/views/shared/_sul_header.html.erb index 12a937e65..5ce01e2f4 100644 --- a/app/views/shared/_sul_header.html.erb +++ b/app/views/shared/_sul_header.html.erb @@ -21,19 +21,17 @@
  • <%= link_to t('.my_account'), "https://mylibrary.stanford.edu/" %>
  • - <% unless current_page?(feedback_form_path) %> -
  • - <%= link_to "#feedback-form", role: 'button', data: {'bs-toggle':"collapse", 'bs-target':"#feedback-form"} do %> - Feedback - <% end %> -
  • - <% end %> +
  • + <%= link_to "#feedback-form", role: 'button', data: {'bs-toggle':"collapse", 'bs-target':"#feedback-form"} do %> + Feedback + <% end %> +
  • - <%= render template: 'feedback_forms/new' unless current_page?(feedback_form_path) %> + <%= render 'feedback_forms/new' %>
    diff --git a/config/routes.rb b/config/routes.rb index b89e870e8..7a083eaf0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -61,6 +61,5 @@ post :comment, as: :comment end end - resource :feedback_form, path: 'feedback', only: %I[new, create] - get 'feedback' => 'feedback_forms#new' + resource :feedback_form, path: 'feedback', only: :create end diff --git a/spec/requests/feedback_forms_spec.rb b/spec/requests/feedback_forms_spec.rb index f5fd7844b..f9be0e115 100644 --- a/spec/requests/feedback_forms_spec.rb +++ b/spec/requests/feedback_forms_spec.rb @@ -2,13 +2,13 @@ require 'rails_helper' -RSpec.describe 'FeedbackForm', type: :feature do +RSpec.describe 'The feedback form', type: :feature do let(:current_user?) { false } let(:user) { create(:sso_user) } context 'when not logged in' do it 'reCAPTCHA challenge is present' do - visit feedback_path + visit root_path expect(page).to have_css '.requests-captcha' end end @@ -19,7 +19,7 @@ end it 'reCAPTCHA challenge is NOT present' do - visit feedback_path + visit root_path expect(page).to have_no_css '.requests-captcha' end