diff --git a/Gemfile b/Gemfile index e302658a8..5d399ec75 100644 --- a/Gemfile +++ b/Gemfile @@ -173,7 +173,7 @@ group :development do # Automatic test runs gem 'guard-cucumber', '1.4.0' - gem 'guard-rspec', '3.0.2' + gem 'guard-rspec', '4.2.3' gem 'rb-fsevent', '0.9.3', :require => false gem 'rb-inotify', '0.9.0', :require => false @@ -207,7 +207,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", '2.13.2' + gem "rspec-rails", '2.14.1' # Cucumber (integration tests) gem 'cucumber-rails', '1.4.0', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index e69105c3a..3972e0d1f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,7 +61,7 @@ GEM ffi (~> 1.0, >= 1.0.11) chunky_png (1.2.8) client_side_validations (3.2.6) - coderay (1.0.9) + coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -147,18 +147,18 @@ GEM gon (4.1.1) actionpack (>= 2.3.0) json - guard (1.8.2) + guard (2.2.5) formatador (>= 0.2.4) - listen (>= 1.0.0) - lumberjack (>= 1.0.2) - pry (>= 0.9.10) - thor (>= 0.14.6) + listen (~> 2.1) + lumberjack (~> 1.0) + pry (>= 0.9.12) + thor (>= 0.18.1) guard-cucumber (1.4.0) cucumber (>= 1.2.0) guard (>= 1.1.0) - guard-rspec (3.0.2) - guard (>= 1.8) - rspec (~> 2.13) + guard-rspec (4.2.3) + guard (~> 2.1) + rspec (>= 2.14, < 4.0) guard-spork (1.5.1) childprocess (>= 0.2.3) guard (>= 1.1) @@ -200,10 +200,10 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.8.1) - listen (1.2.2) + listen (2.4.0) + celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - rb-kqueue (>= 0.2) lumberjack (1.0.4) mail (2.5.4) mime-types (~> 1.16) @@ -259,8 +259,8 @@ GEM nokogiri orm_adapter (0.4.0) polyglot (0.3.3) - pry (0.9.12.2) - coderay (~> 1.0.5) + pry (0.9.12.4) + coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) rack (1.4.5) @@ -321,8 +321,6 @@ GEM rb-fsevent (0.9.3) rb-inotify (0.9.0) ffi (>= 0.5.0) - rb-kqueue (0.2.0) - ffi (>= 0.5.0) rdoc (3.12.2) json (~> 1.4) redcarpet (3.0.0) @@ -334,22 +332,23 @@ GEM roxml (3.1.6) activesupport (>= 2.3.0) nokogiri (>= 1.3.3) - rspec (2.13.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) - rspec-core (2.13.1) - rspec-expectations (2.13.0) + rspec (2.14.1) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + rspec-core (2.14.7) + rspec-expectations (2.14.4) diff-lcs (>= 1.1.3, < 2.0) rspec-instafail (0.2.4) - rspec-mocks (2.13.1) - rspec-rails (2.13.2) + rspec-mocks (2.14.4) + rspec-rails (2.14.1) actionpack (>= 3.0) + activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) ruby-hmac (0.4.0) ruby-oembed (0.8.9) ruby-progressbar (1.1.1) @@ -378,7 +377,7 @@ GEM tilt (~> 1.3, >= 1.3.3) sinon-rails (1.7.3) railties (>= 3.1) - slop (3.4.6) + slop (3.4.7) spork (1.0.0rc3) sprockets (2.2.2) hike (~> 1.2) @@ -454,7 +453,7 @@ DEPENDENCIES galetahub-simple_captcha (= 0.1.5) gon (= 4.1.1) guard-cucumber (= 1.4.0) - guard-rspec (= 3.0.2) + guard-rspec (= 4.2.3) guard-spork (= 1.5.1) haml (= 4.0.3) handlebars_assets (= 0.12.0) @@ -492,7 +491,7 @@ DEPENDENCIES rmagick (= 2.13.2) roxml (= 3.1.6) rspec-instafail (= 0.2.4) - rspec-rails (= 2.13.2) + rspec-rails (= 2.14.1) ruby-oembed (= 0.8.9) sass-rails (= 3.2.6) selenium-webdriver (= 2.39.0)