From cf9e2ad442f700bae5b1ea8f5438855194e13f1a Mon Sep 17 00:00:00 2001
From: Aaron Contreras <aaronlcaq@gmail.com>
Date: Mon, 5 Jun 2023 09:45:09 -0500
Subject: [PATCH] [REFACTOR] Prefix project-scoped routes with `project`

---
 .../meeting/app/views/meetings/index.html.erb  |  2 +-
 modules/meeting/config/routes.rb               |  6 +++---
 .../spec/features/meetings_copy_spec.rb        |  2 +-
 .../spec/features/meetings_delete_spec.rb      | 18 ++++++++++--------
 .../spec/support/pages/meetings/index.rb       |  2 +-
 .../meeting/spec/support/pages/meetings/new.rb |  2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/modules/meeting/app/views/meetings/index.html.erb b/modules/meeting/app/views/meetings/index.html.erb
index e1dbe78001b0..bf9d94998e23 100644
--- a/modules/meeting/app/views/meetings/index.html.erb
+++ b/modules/meeting/app/views/meetings/index.html.erb
@@ -32,7 +32,7 @@ See COPYRIGHT and LICENSE files for more details.
 <%= toolbar title: t(:label_meeting_plural) do %>
   <% if authorize_for(:meetings, :new) %>
     <li class="toolbar-item">
-      <a href="<%= new_meeting_path %>"
+      <a href="<%= polymorphic_path([:new , @project, :meeting]) %>"
          id="add-meeting-button"
          title="<%= I18n.t(:label_meeting_new) %>"
          arial-label="<%= I18n.t(:label_meeting_new) %>"
diff --git a/modules/meeting/config/routes.rb b/modules/meeting/config/routes.rb
index 2a1250bd2da7..0c743ee9e843 100644
--- a/modules/meeting/config/routes.rb
+++ b/modules/meeting/config/routes.rb
@@ -27,11 +27,11 @@
 #++
 
 OpenProject::Application.routes.draw do
-  scope 'projects/:project_id' do
-    resources :meetings, only: %i[new create index]
+  resources :projects, only: %i[] do
+    resources :meetings, only: %i[index new create]
   end
 
-  resources :meetings, except: %i[new create] do
+  resources :meetings do
     resource :agenda, controller: 'meeting_agendas', only: [:update] do
       member do
         get :history
diff --git a/modules/meeting/spec/features/meetings_copy_spec.rb b/modules/meeting/spec/features/meetings_copy_spec.rb
index 514a5a6157a8..a6e2bcd9a9cf 100644
--- a/modules/meeting/spec/features/meetings_copy_spec.rb
+++ b/modules/meeting/spec/features/meetings_copy_spec.rb
@@ -65,7 +65,7 @@
   end
 
   it 'copying a meeting' do
-    visit meetings_path(project)
+    visit project_meetings_path(project)
 
     click_link meeting.title
 
diff --git a/modules/meeting/spec/features/meetings_delete_spec.rb b/modules/meeting/spec/features/meetings_delete_spec.rb
index fd079e69f591..2ef36dee1459 100644
--- a/modules/meeting/spec/features/meetings_delete_spec.rb
+++ b/modules/meeting/spec/features/meetings_delete_spec.rb
@@ -44,6 +44,8 @@
   let!(:meeting) { create(:meeting, project:, title: 'Own awesome meeting!', author: user) }
   let!(:other_meeting) { create(:meeting, project:, title: 'Other awesome meeting!', author: other_user) }
 
+  let(:index_path) { project_meetings_path(project) }
+
   before do
     login_as(user)
   end
@@ -51,8 +53,8 @@
   context 'with permission to delete meetings', js: true do
     let(:permissions) { %i[view_meetings delete_meetings] }
 
-    it 'can delete own and other`s meetings' do
-      visit meetings_path(project)
+    it "can delete own and other's meetings" do
+      visit index_path
 
       SeleniumHubWaiter.wait
       click_link meeting.title
@@ -62,7 +64,7 @@
       page.accept_confirm
 
       expect(page)
-        .to have_current_path meetings_path(project)
+        .to have_current_path index_path
 
       SeleniumHubWaiter.wait
       click_link other_meeting.title
@@ -74,22 +76,22 @@
       expect(page)
         .to have_content(I18n.t('.no_results_title_text', cascade: true))
 
-      expect(current_path)
-        .to eql meetings_path(project)
+      expect(page)
+        .to have_current_path index_path
     end
   end
 
   context 'without permission to delete meetings' do
     let(:permissions) { %i[view_meetings] }
 
-    it 'cannot delete own and other`s meetings' do
-      visit meetings_path(project)
+    it "cannot delete own and other's meetings" do
+      visit index_path
 
       click_link meeting.title
       expect(page)
         .not_to have_link 'Delete'
 
-      visit meetings_path(project)
+      visit index_path
 
       click_link other_meeting.title
       expect(page)
diff --git a/modules/meeting/spec/support/pages/meetings/index.rb b/modules/meeting/spec/support/pages/meetings/index.rb
index c6bdab8c3905..5550953158ca 100644
--- a/modules/meeting/spec/support/pages/meetings/index.rb
+++ b/modules/meeting/spec/support/pages/meetings/index.rb
@@ -103,7 +103,7 @@ def navigate_by_modules_menu
     end
 
     def path
-      meetings_path(project)
+      polymorphic_path([project, :meetings])
     end
   end
 end
diff --git a/modules/meeting/spec/support/pages/meetings/new.rb b/modules/meeting/spec/support/pages/meetings/new.rb
index d9fc77915e19..5448a66759b0 100644
--- a/modules/meeting/spec/support/pages/meetings/new.rb
+++ b/modules/meeting/spec/support/pages/meetings/new.rb
@@ -66,7 +66,7 @@ def invite(user)
     end
 
     def path
-      new_meeting_path(project)
+      polymorphic_path([:new, project, :meeting])
     end
   end
 end