From 5daf16262903ac7119e4ab02510d7ed6387867a5 Mon Sep 17 00:00:00 2001 From: Julianna Tetreault <32834804+juliannatetreault@users.noreply.github.com> Date: Thu, 6 Aug 2020 07:58:19 -0600 Subject: [PATCH] [deploy] Update "/internal/badges" route to "/internal/badge_achievements" (#9643) * Update /internal/badges route to be /internal/badges/award -Updates the route -Redirects the old route, /internal/badges, to the new route * Updates the redirect in #award_badges to correct route -Updates #award_badges in Internal::Badges::Controller to account for the new route, /internal/badges/award * Adjust route to be /internal/badges/award in admin_awards_badges_spec.rb * Adjust URL to be /internal/badges/award in badges_spec.rb * Replace /internal/badges/award with /internal/badge_achievements to follow convention -Updates the old route in routes.rb -Updates the old route in #award_badges in Internal::Badges::Controller -Updates the old route in admin_awards_badges_spec.rb -Updates the old route in badges_spec.rb --- app/controllers/internal/badges_controller.rb | 2 +- config/routes.rb | 3 ++- spec/requests/internal/badges_spec.rb | 4 ++-- spec/system/internal/admin_awards_badges_spec.rb | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/internal/badges_controller.rb b/app/controllers/internal/badges_controller.rb index 118826988..9d4fc17ba 100644 --- a/app/controllers/internal/badges_controller.rb +++ b/app/controllers/internal/badges_controller.rb @@ -17,7 +17,7 @@ module Internal redirect_to internal_badges_url rescue ArgumentError => e flash[:danger] = e.message - redirect_to "/internal/badges" + redirect_to "/internal/badge_achievements" end private diff --git a/config/routes.rb b/config/routes.rb index 8a67c7f92..fde644b38 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -115,7 +115,8 @@ Rails.application.routes.draw do end resources :webhook_endpoints, only: :index resource :config - resources :badges, only: :index + resources :badges, only: %i[index], path: "/badge_achievements" + get "/badges", to: redirect("/internal/badge_achievements") post "badges/award_badges", to: "badges#award_badges" resources :secrets, only: %i[index] put "secrets", to: "secrets#update" diff --git a/spec/requests/internal/badges_spec.rb b/spec/requests/internal/badges_spec.rb index 30b9a7259..8c43df26a 100644 --- a/spec/requests/internal/badges_spec.rb +++ b/spec/requests/internal/badges_spec.rb @@ -1,9 +1,9 @@ require "rails_helper" require "requests/shared_examples/internal_policy_dependant_request" -RSpec.describe "/internal/badges", type: :request do +RSpec.describe "/internal/badge_achievements", type: :request do it_behaves_like "an InternalPolicy dependant request", Badge do - let(:request) { get "/internal/badges" } + let(:request) { get "/internal/badge_achievements" } end describe "POST /internal/badges/award_badges" do diff --git a/spec/system/internal/admin_awards_badges_spec.rb b/spec/system/internal/admin_awards_badges_spec.rb index b7409314c..6190e48cd 100644 --- a/spec/system/internal/admin_awards_badges_spec.rb +++ b/spec/system/internal/admin_awards_badges_spec.rb @@ -22,7 +22,7 @@ RSpec.describe "Admin awards badges", type: :system do before do create_list :badge, 5 sign_in admin - visit "/internal/badges" + visit "/internal/badge_achievements" end it "loads the view" do