Merge branch 'master' into deflake-detached_filters_two_grids_spec

garethson · Feb 13, 2019 · ec9415a · ec9415a
2 parents 3c0e9bc + 9f46bcc
commit ec9415a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/spec/features/auto_reloads2_request_spec.rb b/spec/features/auto_reloads2_request_spec.rb
@@ -153,6 +153,10 @@
       click_on 'Title'
     end
 
+    within 'div.wice-grid-container table.wice-grid tbody tr:first-child td.sorted' do
+      expect(page).to have_content('ab')
+    end
+
     within '.pagination_status' do
       expect(page).to have_content('1-3 / 3')
     end

diff --git a/spec/features/auto_reloads_request_spec.rb b/spec/features/auto_reloads_request_spec.rb
@@ -154,6 +154,10 @@
       click_on 'Title'
     end
 
+    within 'div.wice-grid-container table.wice-grid tbody tr:first-child td.sorted' do
+      expect(page).to have_content('ab')
+    end
+
     within '.pagination_status' do
       expect(page).to have_content('1-3 / 3')
     end
@@ -337,7 +341,7 @@
       expect(page).to have_content('1-2 / 2')
     end
 
-    within 'div#grid.wice-grid-container table.wice-grid tbody tr:first-child td.active-filter' do
+    within 'div.wice-grid-container table.wice-grid tbody tr:first-child td.active-filter' do
       expect(page).to have_content('sed impedit iste')
     end
 

diff --git a/spec/features/detached_filters_two_grids_spec.rb b/spec/features/detached_filters_two_grids_spec.rb
@@ -51,6 +51,8 @@
     find(:css, '.external-buttons-grid1 .wg-external-reset-button').click
 
     expect(page).to have_select('grid_f_archived', selected: '--')
+    expect(page).to have_selector('#grid_f_due_date_fr_date_placeholder:not([value])')
+    expect(page).to have_selector('#grid_f_due_date_to_date_placeholder:not([value])')
 
     within 'div#grid.wice-grid-container .pagination_status' do
       expect(page).to have_content('1-20 / 50')
@@ -63,6 +65,8 @@
     find(:css, '.external-buttons-grid2 .wg-external-reset-button').click
 
     expect(page).to have_select('grid2_f_archived', selected: '--')
+    expect(page).to have_selector('#grid2_f_due_date_fr_date_placeholder:not([value])')
+    expect(page).to have_selector('#grid2_f_due_date_to_date_placeholder:not([value])')
 
     within 'div#grid.wice-grid-container .pagination_status' do
       expect(page).to have_content('1-20 / 50')

diff --git a/spec/features/shared_detached_filters.rb b/spec/features/shared_detached_filters.rb
@@ -82,6 +82,12 @@
       expect(page).to have_content('1-2 / 2')
     end
 
+    within 'div.wice-grid-container table.wice-grid tbody tr:first-child td.active-filter' do
+      expect(page).to have_content('sed impedit iste')
+    end
+
+    expect(page).to have_content('corporis expedita vel')
+
     click_button('Reset')
     within '.pagination_status' do
       expect(page).to have_content('1-20 / 50')