BigW Consortium Gitlab

Commit 15133d99 by Robert Speicher Committed by Dmitriy Zaporozhets

Bump rspec to 3.3.0

parent 1f7490a2
...@@ -222,16 +222,16 @@ group :development do ...@@ -222,16 +222,16 @@ group :development do
end end
group :development, :test do group :development, :test do
gem 'awesome_print'
gem 'byebug'
gem 'pry-rails'
gem 'coveralls', require: false gem 'coveralls', require: false
gem 'database_cleaner'
gem 'factory_girl_rails'
gem 'rspec-rails', '~> 3.3.0'
gem 'rubocop', '0.28.0', require: false gem 'rubocop', '0.28.0', require: false
gem 'spinach-rails' gem 'spinach-rails'
gem "rspec-rails", '3.0.0'
gem "capybara", '~> 2.3'
gem 'capybara-screenshot', '~> 1.0.0'
gem "pry-rails"
gem "awesome_print"
gem "database_cleaner"
gem 'factory_girl_rails'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.3.0' gem 'minitest', '~> 5.3.0'
...@@ -239,8 +239,9 @@ group :development, :test do ...@@ -239,8 +239,9 @@ group :development, :test do
# Generate Fake data # Generate Fake data
gem 'ffaker', '~> 2.0.0' gem 'ffaker', '~> 2.0.0'
# PhantomJS driver for Capybara gem 'capybara', '~> 2.3.0'
gem 'poltergeist', '~> 1.6.0' gem 'capybara-screenshot', '~> 1.0.0'
gem 'poltergeist', '~> 1.6.0'
gem 'teaspoon', '~> 1.0.0' gem 'teaspoon', '~> 1.0.0'
gem 'teaspoon-jasmine' gem 'teaspoon-jasmine'
...@@ -249,8 +250,6 @@ group :development, :test do ...@@ -249,8 +250,6 @@ group :development, :test do
gem 'spring-commands-rspec', '~> 1.0.0' gem 'spring-commands-rspec', '~> 1.0.0'
gem 'spring-commands-spinach', '~> 1.0.0' gem 'spring-commands-spinach', '~> 1.0.0'
gem 'spring-commands-teaspoon', '~> 0.0.2' gem 'spring-commands-teaspoon', '~> 0.0.2'
gem "byebug"
end end
group :test do group :test do
......
...@@ -82,7 +82,7 @@ GEM ...@@ -82,7 +82,7 @@ GEM
columnize (~> 0.8) columnize (~> 0.8)
debugger-linecache (~> 1.2) debugger-linecache (~> 1.2)
cal-heatmap-rails (0.0.1) cal-heatmap-rails (0.0.1)
capybara (2.4.4) capybara (2.3.0)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
...@@ -449,7 +449,7 @@ GEM ...@@ -449,7 +449,7 @@ GEM
quiet_assets (1.0.2) quiet_assets (1.0.2)
railties (>= 3.1, < 5.0) railties (>= 3.1, < 5.0)
racc (1.4.10) racc (1.4.10)
rack (1.5.4) rack (1.5.5)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
rack-attack (4.3.0) rack-attack (4.3.0)
...@@ -530,22 +530,23 @@ GEM ...@@ -530,22 +530,23 @@ GEM
rqrcode (0.4.2) rqrcode (0.4.2)
rqrcode-rails3 (0.1.7) rqrcode-rails3 (0.1.7)
rqrcode (>= 0.4.2) rqrcode (>= 0.4.2)
rspec-core (3.0.4) rspec-core (3.3.1)
rspec-support (~> 3.0.0) rspec-support (~> 3.3.0)
rspec-expectations (3.0.4) rspec-expectations (3.3.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0) rspec-support (~> 3.3.0)
rspec-mocks (3.0.4) rspec-mocks (3.3.0)
rspec-support (~> 3.0.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-rails (3.0.0) rspec-support (~> 3.3.0)
actionpack (>= 3.0) rspec-rails (3.3.2)
activesupport (>= 3.0) actionpack (>= 3.0, < 4.3)
railties (>= 3.0) activesupport (>= 3.0, < 4.3)
rspec-core (~> 3.0.0) railties (>= 3.0, < 4.3)
rspec-expectations (~> 3.0.0) rspec-core (~> 3.3.0)
rspec-mocks (~> 3.0.0) rspec-expectations (~> 3.3.0)
rspec-support (~> 3.0.0) rspec-mocks (~> 3.3.0)
rspec-support (3.0.4) rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rubocop (0.28.0) rubocop (0.28.0)
astrolabe (~> 1.3) astrolabe (~> 1.3)
parser (>= 2.2.0.pre.7, < 3.0) parser (>= 2.2.0.pre.7, < 3.0)
...@@ -738,7 +739,7 @@ DEPENDENCIES ...@@ -738,7 +739,7 @@ DEPENDENCIES
browser (~> 0.8.0) browser (~> 0.8.0)
byebug byebug
cal-heatmap-rails (~> 0.0.1) cal-heatmap-rails (~> 0.0.1)
capybara (~> 2.3) capybara (~> 2.3.0)
capybara-screenshot (~> 1.0.0) capybara-screenshot (~> 1.0.0)
carrierwave carrierwave
charlock_holmes charlock_holmes
...@@ -818,7 +819,7 @@ DEPENDENCIES ...@@ -818,7 +819,7 @@ DEPENDENCIES
request_store request_store
rerun (~> 0.10.0) rerun (~> 0.10.0)
rqrcode-rails3 rqrcode-rails3
rspec-rails (= 3.0.0) rspec-rails (~> 3.3.0)
rubocop (= 0.28.0) rubocop (= 0.28.0)
rugments (~> 1.0.0.beta7) rugments (~> 1.0.0.beta7)
sanitize (~> 2.0) sanitize (~> 2.0)
...@@ -858,3 +859,6 @@ DEPENDENCIES ...@@ -858,3 +859,6 @@ DEPENDENCIES
virtus virtus
webmock (~> 1.21.0) webmock (~> 1.21.0)
wikicloth (= 0.8.1) wikicloth (= 0.8.1)
BUNDLED WITH
1.10.4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment