From a61ef038ea240ba1c86ba7e3b7123f14c760c5e4 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Sun, 30 Aug 2015 17:59:12 -0400 Subject: Bump rspec-rails to 3.3.0 Remove guard, growl, rb-fsevent, rb-inotify --- Gemfile | 8 ++------ Gemfile.lock | 62 +++++++++++++++++++++--------------------------------------- 2 files changed, 24 insertions(+), 46 deletions(-) diff --git a/Gemfile b/Gemfile index f8ffdde..71f7f1b 100644 --- a/Gemfile +++ b/Gemfile @@ -107,15 +107,15 @@ group :development do gem 'annotate' gem 'quiet_assets' gem "letter_opener" - gem "spring-commands-rspec" end group :development, :test do gem 'spring', '~> 1.3.6' + gem "spring-commands-rspec", '~> 1.0.0' gem 'minitest' gem 'pry' - gem 'rspec-rails' + gem 'rspec-rails', '~> 3.3.0' gem 'capybara' gem 'poltergeist', '~> 1.5.1' gem 'factory_girl_rails' @@ -123,10 +123,6 @@ group :development, :test do gem "byebug" gem "database_cleaner" gem 'shoulda-matchers' - gem 'guard-rspec' - gem 'rb-fsevent', require: darwin_only('rb-fsevent') - gem 'growl', require: darwin_only('growl') - gem 'rb-inotify', require: linux_only('rb-inotify') gem "simplecov", require: false gem 'coveralls', '~> 0.8.2', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 5d648b3..1575c0b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,7 +123,6 @@ GEM multipart-post (>= 1.2, < 3) fastercsv (1.5.5) ffaker (1.22.1) - ffi (1.9.3) fission (0.5.0) CFPropertyList (~> 2.2) fog (1.25.0) @@ -201,16 +200,6 @@ GEM grape-entity (0.3.0) activesupport multi_json (>= 1.3.2) - growl (1.0.3) - guard (2.2.4) - formatador (>= 0.2.4) - listen (~> 2.1) - lumberjack (~> 1.0) - pry (>= 0.9.12) - thor (>= 0.18.1) - guard-rspec (4.2.0) - guard (>= 2.1.1) - rspec (>= 2.14, < 4.0) haml (4.0.6) tilt haml-rails (0.5.3) @@ -249,11 +238,6 @@ GEM addressable (~> 2.3) letter_opener (1.1.2) launchy (~> 2.2) - listen (2.4.0) - celluloid (>= 0.15.2) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - lumberjack (1.0.4) mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) @@ -329,9 +313,6 @@ GEM rainbow (2.0.0) raindrops (0.13.0) rake (10.4.2) - rb-fsevent (0.9.3) - rb-inotify (0.9.2) - ffi (>= 0.5.0) rbvmomi (1.8.2) builder nokogiri (>= 1.4.1) @@ -344,21 +325,23 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - 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-mocks (2.14.4) - rspec-rails (2.14.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) + rspec-core (3.3.2) + rspec-support (~> 3.3.0) + rspec-expectations (3.3.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.3.0) + rspec-mocks (3.3.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.3.0) + rspec-rails (3.3.2) + actionpack (>= 3.0, < 4.3) + activesupport (>= 3.0, < 4.3) + railties (>= 3.0, < 4.3) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-support (~> 3.3.0) + rspec-support (3.3.0) rubocop (0.28.0) astrolabe (~> 1.3) parser (>= 2.2.0.pre.7, < 3.0) @@ -482,8 +465,6 @@ DEPENDENCIES gitlab_ci_meta (~> 4.0) grape grape-entity - growl - guard-rspec haml-rails (~> 0.5.3) hipchat (~> 1.5.0) httparty (= 0.11.0) @@ -504,10 +485,8 @@ DEPENDENCIES rack-mini-profiler rails (= 4.1.12) rake - rb-fsevent - rb-inotify request_store - rspec-rails + rspec-rails (~> 3.3.0) rubocop (= 0.28.0) sass-rails (~> 4.0.5) settingslogic @@ -518,7 +497,7 @@ DEPENDENCIES slack-notifier (~> 1.0.0) slim spring (~> 1.3.6) - spring-commands-rspec + spring-commands-rspec (~> 1.0.0) sprockets (~> 2.12.3) stamp state_machine @@ -529,3 +508,6 @@ DEPENDENCIES virtus (= 1.0.1) webmock whenever + +BUNDLED WITH + 1.10.6 -- cgit v1.2.1