fixing bad rebase

phac-nml · Oct 15, 2024 · 3a82d30 · 3a82d30
1 parent 957531a
commit 3a82d30
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/test/system/projects/samples_test.rb b/test/system/projects/samples_test.rb
@@ -520,19 +520,6 @@ class SamplesTest < ApplicationSystemTestCase
       visit namespace_project_samples_url(namespace1, project2)
       assert_text strip_tags(I18n.t(:'viral.pagy.limit_component.summary', from: 1, to: 20, count: 220,
                                                                            locale: @user.locale))
-<<<<<<< HEAD
-=======
-
-      click_button I18n.t(:'projects.samples.index.select_all_button')
-
-      within 'tbody' do
-        assert_selector 'input[name="sample_ids[]"]:checked', count: 20, wait: 1
-      end
-      within 'tfoot' do
-        assert_text 'Samples: 220'
-        assert_selector 'strong[data-selection-target="selected"]', text: '220'
-      end
->>>>>>> a8eb74e2a (attempting to fix flaky test)
     end
 
     test 'empty state of transfer sample project selection' do