1 files changed, 40 insertions, 16 deletions

diff --git a/spec/features/projects/issues/design_management/user_paginates_designs_spec.rb b/spec/features/projects/issues/design_management/user_paginates_designs_spec.rb
index f871ca60596..aff8951d9de 100644
--- a/spec/features/projects/issues/design_management/user_paginates_designs_spec.rb
+++ b/spec/features/projects/issues/design_management/user_paginates_designs_spec.rb
@@ -8,33 +8,57 @@ RSpec.describe 'User paginates issue designs', :js do
   let(:project) { create(:project_empty_repo, :public) }
   let(:issue) { create(:issue, project: project) }
 
-  before do
-    enable_design_management
+  context 'design_management_moved flag disabled' do
+    before do
+      stub_feature_flags(design_management_moved: false)
+      enable_design_management
 
-    create_list(:design, 2, :with_file, issue: issue)
+      create_list(:design, 2, :with_file, issue: issue)
+      visit project_issue_path(project, issue)
+      click_link 'Designs'
+      wait_for_requests
+      find('.js-design-list-item', match: :first).click
+    end
 
-    visit project_issue_path(project, issue)
+    it 'paginates to next design' do
+      expect(find('.js-previous-design')[:disabled]).to eq('true')
 
-    click_link 'Designs'
+      page.within(find('.js-design-header')) do
+        expect(page).to have_content('1 of 2')
+      end
 
-    wait_for_requests
+      find('.js-next-design').click
 
-    find('.js-design-list-item', match: :first).click
-  end
+      expect(find('.js-previous-design')[:disabled]).not_to eq('true')
 
-  it 'paginates to next design' do
-    expect(find('.js-previous-design')[:disabled]).to eq('true')
+      page.within(find('.js-design-header')) do
+        expect(page).to have_content('2 of 2')
+      end
+    end
+  end
 
-    page.within(find('.js-design-header')) do
-      expect(page).to have_content('1 of 2')
+  context 'design_management_moved flag enabled' do
+    before do
+      enable_design_management
+      create_list(:design, 2, :with_file, issue: issue)
+      visit project_issue_path(project, issue)
+      find('.js-design-list-item', match: :first).click
     end
 
-    find('.js-next-design').click
+    it 'paginates to next design' do
+      expect(find('.js-previous-design')[:disabled]).to eq('true')
+
+      page.within(find('.js-design-header')) do
+        expect(page).to have_content('1 of 2')
+      end
+
+      find('.js-next-design').click
 
-    expect(find('.js-previous-design')[:disabled]).not_to eq('true')
+      expect(find('.js-previous-design')[:disabled]).not_to eq('true')
 
-    page.within(find('.js-design-header')) do
-      expect(page).to have_content('2 of 2')
+      page.within(find('.js-design-header')) do
+        expect(page).to have_content('2 of 2')
+      end
     end
   end
 end