Merge branch 'master' into ruby-2.6

.circleci/config.yml

@@ -34,6 +34,10 @@ build_job: &build_job
     # Run the tests
     - run: bundle exec appraisal rspec
 
+    - store_artifacts:
+        path: spec/support/test_app/tmp/capybara
+        destination: screenshots
+
 version: 2
 jobs:
   build-ruby24:

spec/features/auto_reloads2_request_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'acceptance_helper'
 
-describe 'auto reloads 2 WiceGrid', type: :request, js: true do
+describe 'auto reloads 2 WiceGrid', type: :feature, js: true do
   before :each do
     visit '/auto_reloads2'
   end
@@ -161,6 +161,10 @@
       expect(page).to have_content('1-3 / 3')
     end
 
+    within 'div.wice-grid-container table.wice-grid tbody tr:first-child td.sorted' do
+      expect(page).to have_content('ab')
+    end
+
     expect(page).to have_content('507')
     expect(page).to have_content('508')
     expect(page).to have_content('509')

spec/features/auto_reloads_request_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'acceptance_helper'
 
-describe 'auto reloads WiceGrid', type: :request, js: true do
+describe 'auto reloads WiceGrid', type: :feature, js: true do
   before :each do
     visit '/auto_reloads'
   end

spec/features/detached_filters_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'acceptance_helper'
 
-describe 'buttons WiceGrid', type: :request, js: true do
+describe 'buttons WiceGrid', type: :feature, js: true do
   before :each do
     visit '/detached_filters'
   end

spec/features/detached_filters_two_grids_spec.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 require 'acceptance_helper'
 
-describe 'buttons WiceGrid', type: :request, js: true do
+describe 'buttons WiceGrid', type: :feature, js: true do
   before :each do
     visit '/detached_filters_two_grids'
   end
 
-  it 'should be independant of each other' do
+  it 'should be independent of each other' do
     select 'yes', from: 'grid_f_archived'
 
     find(:css, '.external-buttons-grid1 .wg-external-submit-button').click
@@ -50,6 +50,7 @@
 
     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])')
 
@@ -63,6 +64,7 @@
 
     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])')
 

spec/features/shared_detached_filters.rb

@@ -74,6 +74,10 @@
       click_on 'ID'
     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
+
     within '.pagination_status' do
       expect(page).to have_content('1-2 / 2')
     end