DGNum/demarches-normaliennes
11
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6449 from betagouv/fix-specs-warnings

Browse source 
Correction de messages d'avertissement dans les tests
This commit is contained in:
Pierre de La Morinerie 2021-09-09 10:09:19 -05:00 committed by GitHub
commit fb865f500c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -76,12 +76,11 @@ gem 'sentry-rails'
gem 'sentry-ruby'
gem 'sib-api-v3-sdk'
gem 'skylight'
gem 'smart_listing'
gem 'spreadsheet_architect'
gem 'typhoeus'
gem 'warden'
gem 'webpacker'
gem 'zipline'
gem 'zipline', github: 'fringd/zipline', ref: 'd637bbff2' # Unreleased 1.3.0, with a fix for Ruby 3.0 kwargs
gem 'zxcvbn-ruby', require: 'zxcvbn'
group :test do

29
Gemfile.lock
View file

@ -1,3 +1,12 @@
GIT
remote: https://github.com/fringd/zipline.git
revision: d637bbff262f59718d23a65f50b50163b8ba749f
ref: d637bbff2
specs:
zipline (1.3.0)
actionpack (>= 3.2.1, < 7.0)
zip_tricks (>= 4.2.1, < 6.0)
GIT
remote: https://github.com/mina-deploy/mina.git
revision: 84fa84c7f7f94f9518ef9b7099396ab6676b5881
@ -171,13 +180,6 @@ GEM
coderay (1.1.3)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
coffee-rails (5.0.0)
coffee-script (>= 2.2.0)
railties (>= 5.2.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.9)
connection_pool (2.2.3)
crack (0.4.5)
@ -690,11 +692,6 @@ GEM
tilt (~> 2.0)
skylight (5.0.1)
activesupport (>= 5.2.0)
smart_listing (1.2.3)
coffee-rails
jquery-rails
kaminari (>= 0.17)
rails (>= 3.2)
spreadsheet_architect (4.1.0)
axlsx_styler (>= 1.0.0, < 2)
caxlsx (>= 2.0.2, < 4)
@ -774,10 +771,7 @@ GEM
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.4.2)
zip_tricks (5.5.0)
zipline (1.3.0)
actionpack (>= 3.2.1, < 7.0)
zip_tricks (>= 4.2.1, < 6.0)
zip_tricks (5.6.0)
zxcvbn-ruby (1.2.0)
PLATFORMS
@ -885,7 +879,6 @@ DEPENDENCIES
sib-api-v3-sdk
simple_xlsx_reader
skylight
smart_listing
spreadsheet_architect
spring
spring-commands-rspec
@ -897,7 +890,7 @@ DEPENDENCIES
webdrivers (~> 4.0)
webmock
webpacker
zipline
zipline!
zxcvbn-ruby
BUNDLED WITH

75
config/initializers/smart_listing.rb
View file

@ -1,75 +0,0 @@
SmartListing.configure do |config|
config.global_options({
# :param_names => { # param names
# :page => :page,
# :per_page => :per_page,
# :sort => :sort,
# },
# :array => false, # controls whether smart list should be using arrays or AR collections
# :max_count => nil, # limit number of rows
# :unlimited_per_page => false, # allow infinite page size
# :paginate => true, # allow pagination
# :memorize_per_page => false, # save per page settings in the cookie
:page_sizes => [10, 20, 50, 100] # set available page sizes array
# :kaminari_options => {:theme => "smart_listing"}, # Kaminari's paginate helper options
})
config.constants :classes, {
#:main => "smart-listing",
#:editable => "editable",
#:content => "content",
#:loading => "loading",
#:status => "smart-listing-status",
#:item_actions => "actions",
#:new_item_placeholder => "new-item-placeholder",
#:new_item_action => "new-item-action",
#:new_item_button => "btn",
#:hidden => "hidden",
#:autoselect => "autoselect",
#:callback => "callback",
#:pagination_per_page => "pagination-per-page text-center",
#:pagination_count => "count",
#:inline_editing => "info",
#:no_records => "no-records",
#:limit => "smart-listing-limit",
#:limit_alert => "smart-listing-limit-alert",
#:controls => "smart-listing-controls",
#:controls_reset => "reset",
#:filtering => "filter",
#:filtering_search => "glyphicon-search",
#:filtering_cancel => "glyphicon-remove",
#:filtering_disabled => "disabled",
#:sortable => "sortable",
#:icon_new => "glyphicon glyphicon-plus",
#:icon_edit => "glyphicon glyphicon-pencil",
#:icon_trash => "glyphicon glyphicon-trash",
#:icon_inactive => "glyphicon glyphicon-circle",
#:icon_show => "glyphicon glyphicon-share-alt",
#:icon_sort_none => "glyphicon glyphicon-resize-vertical",
#:icon_sort_up => "glyphicon glyphicon-chevron-up",
#:icon_sort_down => "glyphicon glyphicon-chevron-down",
}
config.constants :data_attributes, {
# :main => "smart-listing",
# :confirmation => "confirmation",
# :id => "id",
# :href => "href",
# :callback_href => "callback-href",
# :max_count => "max-count",
# :inline_edit_backup => "smart-listing-edit-backup",
# :params => "params",
# :observed => "observed",
# :href => "href",
# :autoshow => "autoshow",
# :popover => "slpopover",
}
config.constants :selectors, {
# :item_action_destroy => "a.destroy",
# :edit_cancel => "button.cancel",
# :row => "tr",
# :head => "thead",
# :filtering_icon => "i"
}
end

15
config/locales/smart_listing.fr.yml
View file

@ -1,15 +0,0 @@
fr:
smart_listing:
msgs:
destroy_confirmation: Destroy?
no_items: No items
actions:
destroy: Destroy
edit: Edit
show: Show
new: New item
views:
pagination:
per_page: Par page
unlimited: Unlimited
total: Total

6
spec/controllers/instructeurs/archives_controller_spec.rb
View file

@ -23,7 +23,7 @@ describe Instructeurs::ArchivesController, type: :controller do
end
it 'displays archives' do
get :index, { params: { procedure_id: procedure1.id } }
get :index, params: { procedure_id: procedure1.id }
expect(assigns(:archives)).to eq([archive1])
end
@ -34,9 +34,7 @@ describe Instructeurs::ArchivesController, type: :controller do
let(:date_month) { Date.strptime(month, "%Y-%m") }
let(:archive) { create(:archive) }
let(:subject) do
post :create, {
params: { procedure_id: procedure1.id, type: 'monthly', month: month }
}
post :create, params: { procedure_id: procedure1.id, type: 'monthly', month: month }
end
it "performs archive creation job" do

10
spec/support/smart_listing.rb
View file

@ -1,10 +0,0 @@
include SmartListing::Helper
include SmartListing::Helper::ControllerExtensions
module SmartListing
module Helper
def view_context
'mock'
end
end
end