Merge pull request #1747 from alphagov/ldeb-change-add-route-to-page-with-routes

Change where add a question route goes if selected question already has a route

Author: lfdebrux

app/controllers/pages/conditions_controller.rb

@@ -12,7 +12,7 @@ def set_routing_page
 
     if routing_page_input.valid?
       routing_page = PageRepository.find(page_id: routing_page_id, form_id: current_form.id)
-      redirect_to new_condtion_or_skip_path(routing_page)
+      redirect_to new_condition_or_show_routes_path(routing_page)
     else
       render template: "pages/conditions/routing_page", locals: { form: current_form, routing_page_input: }, status: :unprocessable_entity
     end
@@ -97,9 +97,9 @@ def delete_condition_input_params
     params.require(:pages_delete_condition_input).permit(:answer_value, :goto_page_id, :confirm).merge(form: current_form, page:)
   end
 
-  def new_condtion_or_skip_path(page)
+  def new_condition_or_show_routes_path(page)
     if FeatureService.new(group: current_form.group).enabled?(:branch_routing) && page.routing_conditions.present?
-      return new_secondary_skip_path(form_id: current_form.id, page_id: page.id)
+      return show_routes_path(form_id: current_form.id, page_id: page.id)
     end
 
     new_condition_path(current_form.id, page.id)

spec/requests/pages/conditions_controller_spec.rb

@@ -68,8 +68,8 @@
         page
       end
 
-      it "when branch_routing enabled, redirects the user to the new skip condition page", :feature_branch_routing do
-        expect(response).to redirect_to new_secondary_skip_path(form.id, selected_page.id)
+      it "when branch_routing enabled, redirects the user to the question routes page", :feature_branch_routing do
+        expect(response).to redirect_to show_routes_path(form.id, selected_page.id)
       end
 
       it "when branch_routing disabled, redirects the user to the new conditions page" do