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

Merge pull request #1942 from betagouv/bump-gems

Browse source 
Bump gems
This commit is contained in:
LeSim 2018-05-18 18:22:58 +02:00 committed by GitHub
commit 1bc574c8ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.rubocop.yml
View file

@ -79,6 +79,9 @@ Layout/EmptyLineBetweenDefs:
Layout/EmptyLines:
Enabled: true
Layout/EmptyLineAfterGuardClause:
Enabled: false
Layout/EmptyLinesAroundAccessModifier:
Enabled: true
@ -899,9 +902,6 @@ Style/EmptyElse:
Style/EmptyLambdaParameter:
Enabled: true
Style/EmptyLineAfterGuardClause:
Enabled: false
Style/EmptyLiteral:
Enabled: false
@ -995,7 +995,7 @@ Style/MethodCalledOnDoEndBlock:
Style/MethodDefParentheses:
Enabled: true
Style/MethodMissing:
Style/MethodMissingSuper:
Enabled: false
Style/MinMax:
@ -1004,6 +1004,9 @@ Style/MinMax:
Style/MissingElse:
Enabled: false
Style/MissingRespondToMissing:
Enabled: false
Style/MixinGrouping:
Enabled: false

38
Gemfile.lock
View file

@ -95,7 +95,7 @@ GEM
sass-rails (~> 5.0)
selectize-rails (~> 0.6)
aes_key_wrap (1.0.1)
apipie-rails (0.5.7)
apipie-rails (0.5.8)
rails (>= 4.1)
arel (9.0.0)
ast (2.4.0)
@ -114,7 +114,7 @@ GEM
sass (>= 3.3.4)
bootstrap-wysihtml5-rails (0.3.3.8)
railties (>= 3.0)
brakeman (4.2.1)
brakeman (4.3.0)
browser (2.5.3)
builder (3.2.3)
byebug (10.0.2)
@ -178,9 +178,9 @@ GEM
diff-lcs (1.3)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.3.0)
dotenv-rails (2.3.0)
dotenv (= 2.3.0)
dotenv (2.4.0)
dotenv-rails (2.4.0)
dotenv (= 2.4.0)
railties (>= 3.2, < 6.0)
draper (3.0.1)
actionpack (~> 5.0)
@ -420,12 +420,10 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.1.0)
json-jwt (1.9.2)
json-jwt (1.9.4)
activesupport
aes_key_wrap
bindata
securecompare
url_safe_base64
jsonapi-renderer (0.2.0)
jwt (1.5.6)
kaminari (1.1.1)
@ -486,7 +484,7 @@ GEM
mustermann (1.0.2)
nenv (0.3.0)
netrc (0.11.0)
nio4r (2.3.0)
nio4r (2.3.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
notiffany (0.1.1)
@ -508,7 +506,7 @@ GEM
oauth2 (~> 1.1)
omniauth (~> 1.2)
open4 (1.3.4)
openid_connect (1.1.5)
openid_connect (1.1.6)
activemodel
attr_required (>= 1.0.0)
json-jwt (>= 1.5.0)
@ -518,7 +516,7 @@ GEM
validate_email
validate_url
webfinger (>= 1.0.1)
openstack (3.3.17)
openstack (3.3.18)
json
orm_adapter (0.5.0)
parallel (1.12.1)
@ -540,12 +538,12 @@ GEM
byebug (~> 10.0)
pry (~> 0.10)
public_suffix (3.0.2)
rack (2.0.4)
rack (2.0.5)
rack-handlers (0.7.3)
rack
rack-mini-profiler (0.10.7)
rack-mini-profiler (1.0.0)
rack (>= 1.2.0)
rack-oauth2 (1.9.0)
rack-oauth2 (1.9.2)
activesupport
attr_required
httpclient
@ -641,7 +639,7 @@ GEM
rspec-support (3.7.1)
rspec_junit_formatter (0.3.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (0.55.0)
rubocop (0.56.0)
parallel (~> 1.10)
parser (>= 2.5)
powerpack (~> 0.1)
@ -674,14 +672,13 @@ GEM
scss_lint (0.57.0)
rake (>= 0.9, < 13)
sass (~> 3.5.5)
securecompare (1.0.0)
select2-rails (4.0.3)
thor (~> 0.14)
selectize-rails (0.12.4.1)
selenium-webdriver (3.8.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
sentry-raven (2.7.2)
sentry-raven (2.7.3)
faraday (>= 0.7.6, < 1.0)
sexp_processor (4.11.0)
shellany (0.0.1)
@ -745,12 +742,11 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.3.0)
unicode-display_width (1.3.2)
unicode_utils (1.4.0)
unicorn (5.4.0)
kgio (~> 2.6)
raindrops (~> 0.7)
url_safe_base64 (0.2.2)
validate_email (0.1.6)
activemodel (>= 3.0)
mail (>= 2.2.5)
@ -758,7 +754,7 @@ GEM
activemodel (>= 3.0.0)
addressable
vcr (4.0.0)
web-console (3.6.1)
web-console (3.6.2)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
@ -766,7 +762,7 @@ GEM
webfinger (1.1.0)
activesupport
httpclient (>= 2.4)
webmock (3.3.0)
webmock (3.4.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff

22
spec/controllers/api/v1/dossiers_controller_spec.rb
View file

@ -186,7 +186,7 @@ describe API::V1::DossiersController do
describe 'first type de piece justificative' do
subject { super().first }
it { expect(subject.keys.include?(:id)).to be_truthy }
it { expect(subject.key?(:id)).to be_truthy }
it { expect(subject[:libelle]).to eq('RIB') }
it { expect(subject[:description]).to eq('Releve identité bancaire') }
end
@ -200,11 +200,11 @@ describe API::V1::DossiersController do
let(:field_list) { [:url, :created_at, :type_de_piece_justificative_id] }
subject { super()[:pieces_justificatives].first }
it { expect(subject.keys.include?(:content_url)).to be_truthy }
it { expect(subject.key?(:content_url)).to be_truthy }
it { expect(subject[:created_at]).not_to be_nil }
it { expect(subject[:type_de_piece_justificative_id]).not_to be_nil }
it { expect(subject.keys.include?(:user)).to be_truthy }
it { expect(subject.key?(:user)).to be_truthy }
describe 'user' do
subject { super()[:user] }
@ -222,8 +222,8 @@ describe API::V1::DossiersController do
describe 'first champs' do
subject { super().first }
it { expect(subject.keys.include?(:value)).to be_truthy }
it { expect(subject.keys.include?(:type_de_champ)).to be_truthy }
it { expect(subject.key?(:value)).to be_truthy }
it { expect(subject.key?(:type_de_champ)).to be_truthy }
describe 'type de champ' do
let(:field_list) {
@ -237,10 +237,10 @@ describe API::V1::DossiersController do
}
subject { super()[:type_de_champ] }
it { expect(subject.keys.include?(:id)).to be_truthy }
it { expect(subject.key?(:id)).to be_truthy }
it { expect(subject[:libelle]).to include('Libelle du champ') }
it { expect(subject[:description]).to include('description du champ') }
it { expect(subject.keys.include?(:order_place)).to be_truthy }
it { expect(subject.key?(:order_place)).to be_truthy }
it { expect(subject[:type_champ]).to eq('text') }
end
end
@ -295,8 +295,8 @@ describe API::V1::DossiersController do
describe 'first champs' do
subject { super().first }
it { expect(subject.keys.include?(:value)).to be_truthy }
it { expect(subject.keys.include?(:type_de_champ)).to be_truthy }
it { expect(subject.key?(:value)).to be_truthy }
it { expect(subject.key?(:type_de_champ)).to be_truthy }
describe 'type de champ' do
let(:field_list) {
@ -310,10 +310,10 @@ describe API::V1::DossiersController do
}
subject { super()[:type_de_champ] }
it { expect(subject.keys.include?(:id)).to be_truthy }
it { expect(subject.key?(:id)).to be_truthy }
it { expect(subject[:libelle]).to include('Libelle champ privé') }
it { expect(subject[:description]).to include('description du champ privé') }
it { expect(subject.keys.include?(:order_place)).to be_truthy }
it { expect(subject.key?(:order_place)).to be_truthy }
it { expect(subject[:type_champ]).to eq('text') }
end
end