wice_grid 4.1.0 → 6.1.3

data/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
@@ -153,10 +153,18 @@ describe 'auto reloads 2 WiceGrid', type: :request, js: true do
       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
 
+    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')
@@ -293,13 +301,18 @@ describe 'auto reloads 2 WiceGrid', type: :request, js: true do
   end
 
   it 'should negate the semantics of the text  filter' do
+    expect(page).to have_content('sequi')
+    expect(page).to have_content('sed impedit iste')
+
     fill_in('grid_f_title_v', with: 'sed')
     select 'no', from: 'grid_f_archived'
 
+    expect(page).to have_no_content('sequi')
     expect(page).to have_content('sed impedit iste')
 
     find(:css, '#grid_f_title_n').click
 
+    expect(page).to have_content('sequi')
     expect(page).to have_no_content('sed impedit iste')
   end
 
@@ -341,6 +354,10 @@ describe 'auto reloads 2 WiceGrid', type: :request, js: true do
     expect(page).to have_content('corporis expedita vel')
     expect(page).to have_content('sed impedit iste')
 
+    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
+
     find(:css, '.wg-external-reset-button').click
     within '.pagination_status' do
       expect(page).to have_content('1-20 / 50')

data/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
@@ -154,6 +154,10 @@ describe 'auto reloads WiceGrid', type: :request, js: true do
       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
@@ -291,15 +295,24 @@ describe 'auto reloads WiceGrid', type: :request, js: true do
     end
   end
 
-  it 'should negate the semantics of the text  filter' do
+  it 'should negate the semantics of the text filter' do
     fill_in('grid_f_title_v', with: 'sed')
+
+    expect(page).to have_content('sed impedit iste')
+    expect(page).to have_no_content('sequi')
+
     select 'no', from: 'grid_f_archived'
 
+    # Does not change the visible rows, just highlights the archived column
+    expect(page).to have_selector('.wice-grid tbody tr td:nth-child(3).active-filter')
+
     expect(page).to have_content('sed impedit iste')
+    expect(page).to have_no_content('sequi')
 
     find(:css, '#grid_f_title_n').click
 
     expect(page).to have_no_content('sed impedit iste')
+    expect(page).to have_content('sequi')
   end
 
   it 'should reload the title filter' do
@@ -337,8 +350,11 @@ describe 'auto reloads WiceGrid', type: :request, js: true do
       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')
-    expect(page).to have_content('sed impedit iste')
 
     find(:css, '#grid_reset_grid_icon').click
     within '.pagination_status' do

data/spec/features/custom_filters1_request_spec.rb

@@ -1,35 +1,16 @@
 # encoding: utf-8
 require 'acceptance_helper'
 
-describe 'custom_ordering WiceGrid', type: :request, js: true do
+describe 'custom_ordering WiceGrid', type: :feature, js: true do
   before :each do
     visit '/custom_filters1'
   end
 
   it 'should have all options' do
-    within '#g1_f_status' do
-      expect(page).to have_content('Development')
-      expect(page).to have_content('Testing')
-      expect(page).to have_content('Production')
-    end
-
-    within '#g2_f_status' do
-      expect(page).to have_content('Development')
-      expect(page).to have_content('Testing')
-      expect(page).to have_content('Production')
-    end
-
-    within '#g3_f_status' do
-      expect(page).to have_content('development')
-      expect(page).to have_content('testing')
-      expect(page).to have_content('production')
-    end
-
-    within '#g4_f_status' do
-      expect(page).to have_content('development')
-      expect(page).to have_content('testing')
-      expect(page).to have_content('production')
-    end
+    expect(page).to have_select('g1_f_status', options: %w(-- Development Testing Production))
+    expect(page).to have_select('g2_f_status', options: %w(-- Development Testing Production))
+    expect(page).to have_select('g3_f_status', options: %w(-- development testing production))
+    expect(page).to have_select('g4_f_status', options: %w(-- development testing production))
   end
 
   it 'should have expand/collapse' do

data/spec/features/custom_filters2_request_spec.rb

@@ -1,37 +1,15 @@
 # encoding: utf-8
 require 'acceptance_helper'
 
-describe 'custom_ordering WiceGrid', type: :request, js: true do
+describe 'custom_ordering WiceGrid', type: :feature, js: true do
   before :each do
     visit '/custom_filters2'
   end
 
   it 'should have all options' do
-    within '#grid_f_priorities_name' do
-      expect(page).to have_content('Anecdotic')
-      expect(page).to have_content('High')
-      expect(page).to have_content('Low')
-      expect(page).to have_content('Normal')
-      expect(page).to have_content('Urgent')
-    end
-
-    within '#grid_f_status_id' do
-      expect(page).to have_content('Assigned')
-      expect(page).to have_content('Cancelled')
-      expect(page).to have_content('Closed')
-      expect(page).to have_content('Duplicate')
-      expect(page).to have_content('New')
-      expect(page).to have_content('Postponed')
-      expect(page).to have_content('Resolved')
-      expect(page).to have_content('Started')
-      expect(page).to have_content('Verified')
-    end
-
-    within '#grid_f_project_id' do
-      expect(page).to have_content('Divine Firmware')
-      expect(page).to have_content('Super Game')
-      expect(page).to have_content('Ultimate Website')
-    end
+    expect(page).to have_select('grid_f_priorities_name', options: %w(-- Anecdotic High Low Normal Urgent))
+    expect(page).to have_select('grid_f_status_id', options: %w(-- Assigned Cancelled Closed Duplicate New Postponed Resolved Started Verified))
+    expect(page).to have_select('grid_f_project_id', options: ['--', 'Divine Firmware', 'Super Game', 'Ultimate Website'])
   end
 
   it 'should filter by custom filters' do

data/spec/features/custom_filters3_request_spec.rb

@@ -1,30 +1,14 @@
 # encoding: utf-8
 require 'acceptance_helper'
 
-describe 'custom_ordering WiceGrid', type: :request, js: true do
+describe 'custom_ordering WiceGrid', type: :feature, js: true do
   before :each do
     visit '/custom_filters3'
   end
 
   it 'should have all options' do
-    within '#grid_f_expected_version_id' do
-      expect(page).to have_content('1.0')
-      expect(page).to have_content('2.0')
-      expect(page).to have_content('1.2')
-    end
-
-    within '#grid_f_versions_name' do
-      expect(page).to have_content('1.0')
-      expect(page).to have_content('1.1')
-      expect(page).to have_content('1.2')
-      expect(page).to have_content('2.0')
-      expect(page).to have_content('3.0')
-      expect(page).to have_content('6.0')
-      expect(page).to have_content('7.1')
-      expect(page).to have_content('8.0')
-      expect(page).to have_content('88.1')
-      expect(page).to have_content('99.0')
-    end
+    expect(page).to have_select('grid_f_expected_version_id', options: %w(-- 1.0 2.0 1.2))
+    expect(page).to have_select('grid_f_versions_name', options: %w(-- 1.0 1.1 1.2 2.0 3.0 6.0 7.1 8.0 88.1 99.0))
   end
 
   it 'should filter by custom fields' do

data/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

data/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,10 @@ describe 'buttons WiceGrid', type: :request, js: true do
 
     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')
     end
@@ -60,6 +64,10 @@ describe 'buttons WiceGrid', type: :request, js: true do
 
     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')
     end

data/spec/features/shared_detached_filters.rb

@@ -74,12 +74,19 @@ shared_examples "detached_filters" do
       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
 
+    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')
-    expect(page).to have_content('sed impedit iste')
 
     click_button('Reset')
     within '.pagination_status' do
@@ -118,6 +125,10 @@ shared_examples "detached_filters" do
 
     expect(page).to have_selector('.pagination_status', text: '1-12 / 12')
 
+    within 'div.wice-grid-container table.wice-grid tbody tr:first-child td.active-filter' do
+      expect(page).to have_content('Velit atque sapiente aspernatur sint fuga.')
+    end
+
     expect(page).to have_content('Adipisci voluptate sed esse velit.')
     expect(page).to have_content('Ad sunt vel maxime labore temporibus incidunt quidem.')
 
@@ -138,17 +149,23 @@ shared_examples "detached_filters" do
 
     expect(page).to have_content('Inventore iure eos labore ipsum.')
     expect(page).to have_content('Velit atque sapiente aspernatur sint fuga.')
+    expect(page).to have_no_content('Eos qui est quis.')
 
     within 'div.wice-grid-container table.wice-grid thead' do
       click_on 'Description'
     end
 
+    within 'div.wice-grid-container table.wice-grid tbody tr:first-child' do
+      expect(page).to have_content('Accusamus voluptas sunt deleniti iusto dolorem repudiandae.')
+    end
+
     within '.pagination_status' do
       expect(page).to have_content('1-11 / 11')
     end
 
     expect(page).to have_content('Inventore iure eos labore ipsum.')
     expect(page).to have_content('Velit atque sapiente aspernatur sint fuga.')
+    expect(page).to have_no_content('Eos qui est quis.')
 
     click_button('Reset')
     within '.pagination_status' do

data/vendor/assets/javascripts/wice_grid_processor.js.coffee

@@ -14,8 +14,8 @@ class WiceGridProcessor
   process : (domIdToFocus)->
     @visit @buildUrlWithParams(domIdToFocus)
 
-  visit : (path) ->
-    if Turbolinks?
+  visit : (path, use_turbolink = true) ->
+    if Turbolinks? and use_turbolink
       Turbolinks.visit path
     else
       window.location = path
@@ -84,7 +84,7 @@ class WiceGridProcessor
 
 
   exportToCsv : ->
-    @visit @linkForExport
+    @visit @linkForExport, false
 
 
   register : (func)->

data/wice_grid.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name          = 'wice_grid'
-  s.version       = '4.1.0'
+  s.version       = '6.1.3'
   s.authors       = ['Yuri Leikind and contributors']
-  s.email         = ['patrick@yamasolutions.com']
-  s.homepage      = 'https://github.com/patricklindsay/wice_grid'
+  s.email         = ['koulikoff@gmail.com']
+  s.homepage      = 'https://github.com/leikind/wice_grid'
   s.summary       = 'A Rails grid plugin to quickly create grids with sorting, pagination, and filters.'
   s.description   = 'A Rails grid plugin to create grids with sorting, pagination, and filters generated automatically based on column types. ' \
     'The contents of the cell are up for the developer, just like one does when rendering a collection via a simple table. ' \
@@ -13,11 +13,12 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.license       = 'MIT'
   s.require_paths = ['lib']
-  s.date          = '2018-11-28'
+  s.date          = '2024-06-10'
 
-  s.add_dependency 'rails', '~> 5.0', '< 5.3'
-  s.add_dependency 'kaminari',          ['~> 1.1.0']
+  s.add_dependency 'rails', '>= 5.0'
+  s.add_dependency 'kaminari',          ['~> 1.1']
   s.add_dependency 'coffee-rails',      ['> 3.2']
+  s.add_dependency 'font-awesome-sass'
 
   s.add_development_dependency('rake',  '~> 10.1')
   s.add_development_dependency('byebug')
@@ -26,25 +27,26 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '~> 3.6.0')
   s.add_development_dependency('rspec-rails', '~> 3.6.0')
   s.add_development_dependency('shoulda-matchers', '2.8.0')
-  s.add_development_dependency('capybara', '~> 2.2.0')
+  s.add_development_dependency('capybara', '~> 3.13.2')
   s.add_development_dependency('faker', '~> 1.8.7')
-  s.add_development_dependency('poltergeist', '~> 1.9.0')
+  s.add_development_dependency('poltergeist', '~> 1.18.0')
   s.add_development_dependency('capybara-screenshot', '~> 1.0.11')
   s.add_development_dependency('selenium-webdriver', '~> 2.51.0')
+  s.add_development_dependency('phantomjs', '>= 2.1.1')
 
   # Required by the test app.
   s.add_development_dependency('haml', '~> 5.0.4')
   s.add_development_dependency('coderay', '~> 1.1.0')
-  s.add_development_dependency('jquery-rails', '~> 4.3.3')
-  s.add_development_dependency('jquery-ui-rails', '~> 5.0.5')
+  s.add_development_dependency('jquery-rails', '~> 4.4.0')
+  s.add_development_dependency('jquery-ui-rails', '~> 7.0.0')
   s.add_development_dependency('jquery-ui-themes', '~> 0.0.11')
   s.add_development_dependency('sass-rails', '>= 3.2')
-  s.add_development_dependency('bootstrap-sass', '3.1.1.1')
+  s.add_development_dependency('bootstrap-sass', '3.4.1')
   s.add_development_dependency('font-awesome-sass', '4.4.0')
   s.add_development_dependency('turbolinks', '~> 5.1.1')
   s.add_development_dependency('therubyracer')
 
-  s.add_development_dependency('bundler',   '~> 1.3')
+  s.add_development_dependency('bundler')
   s.add_development_dependency('simplecov', '~> 0.7')
   s.add_development_dependency('sqlite3',   '~> 1.3')