unlock bundler-audit, change order of gems in test

This commit is contained in:
Georg Kahest 2017-04-09 21:38:25 +03:00
parent fd5c8bea73
commit 710295621f
2 changed files with 8 additions and 17 deletions

11
Gemfile
View file

@ -138,12 +138,9 @@ group :development, :test do
gem 'pry', '0.10.1' gem 'pry', '0.10.1'
# code review # code review
# gem 'simplecov', '0.10.0', require: false
gem 'rubycritic', '3.2.0' gem 'rubycritic', '3.2.0'
gem 'bullet', '4.14.7' # for finding database optimizations gem 'bullet', '4.14.7' # for finding database optimizations
gem 'bundler-audit', gem 'bundler-audit'
github: 'rubysec/bundler-audit',
ref: 'f89ef7fae1090bbad825ea76812d56d72b417055' # for finding future vulnerable gems
gem 'brakeman', '3.6.1', require: false # for security audit' gem 'brakeman', '3.6.1', require: false # for security audit'
# tmp, otherwise conflics with breakman # tmp, otherwise conflics with breakman
# gem 'html2haml', github: 'haml/html2haml', ref: '6984f50bdbbd6291535027726a5697f28778ee8d' # gem 'html2haml', github: 'haml/html2haml', ref: '6984f50bdbbd6291535027726a5697f28778ee8d'
@ -162,8 +159,8 @@ end
group :test do group :test do
gem 'database_cleaner' gem 'database_cleaner'
gem 'factory_girl_rails' gem 'factory_girl_rails'
gem 'webmock'
gem 'simplecov'
gem 'codeclimate-test-reporter', "~> 1.0.0" gem 'codeclimate-test-reporter', "~> 1.0.0"
gem 'simplecov'
gem 'webmock'
end end

View file

@ -44,15 +44,6 @@ GIT
que (~> 0.6) que (~> 0.6)
rails (>= 4.0) rails (>= 4.0)
GIT
remote: https://github.com/rubysec/bundler-audit.git
revision: f89ef7fae1090bbad825ea76812d56d72b417055
ref: f89ef7fae1090bbad825ea76812d56d72b417055
specs:
bundler-audit (0.4.0)
bundler (~> 1.2)
thor (~> 0.18)
GIT GIT
remote: https://github.com/tarmotalu/digidoc_client.git remote: https://github.com/tarmotalu/digidoc_client.git
revision: 1645e83a5a548addce383f75703b0275c5310c32 revision: 1645e83a5a548addce383f75703b0275c5310c32
@ -137,6 +128,9 @@ GEM
bullet (4.14.7) bullet (4.14.7)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
uniform_notifier (~> 1.9.0) uniform_notifier (~> 1.9.0)
bundler-audit (0.5.0)
bundler (~> 1.2)
thor (~> 0.18)
cancancan (1.11.0) cancancan (1.11.0)
capybara (2.4.4) capybara (2.4.4)
mime-types (>= 1.16) mime-types (>= 1.16)
@ -572,7 +566,7 @@ DEPENDENCIES
bootstrap-sass (= 3.3.5.1) bootstrap-sass (= 3.3.5.1)
brakeman (= 3.6.1) brakeman (= 3.6.1)
bullet (= 4.14.7) bullet (= 4.14.7)
bundler-audit! bundler-audit
cancancan (= 1.11.0) cancancan (= 1.11.0)
capybara (= 2.4.4) capybara (= 2.4.4)
codeclimate-test-reporter (~> 1.0.0) codeclimate-test-reporter (~> 1.0.0)