diff --git a/Gemfile b/Gemfile index 53731301d..4d13fd7ab 100644 --- a/Gemfile +++ b/Gemfile @@ -145,14 +145,9 @@ end group :test, :development do gem 'mock_redis' - # TODO upgrade, but ensure rake autospec still works gem 'listen', '0.7.3', require: false gem 'certified', require: false - if rails4? - gem 'fabrication', github: 'paulelliott/fabrication', require: false - else - gem 'fabrication', require: false - end + gem 'fabrication', require: false gem 'qunit-rails' gem 'mocha', require: false gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock index 7e0d44d4b..128c950f0 100644 --- a/Gemfile_rails4.lock +++ b/Gemfile_rails4.lock @@ -15,12 +15,6 @@ GIT activerecord (>= 3.1, < 4.1) activesupport (>= 3.1, < 4.1) -GIT - remote: git://github.com/paulelliott/fabrication.git - revision: c394cca017e219ff20eb46a9d07b4b338c8e4323 - specs: - fabrication (2.8.1) - GIT remote: git://github.com/rails/rails.git revision: 7b2f64fca71c8d13428eb48b65399736a8327554 @@ -206,6 +200,7 @@ GEM excon (0.27.6) execjs (2.0.2) exifr (1.1.3) + fabrication (2.8.1) fakeweb (1.3.0) faraday (0.8.8) multipart-post (~> 1.2.0) @@ -482,7 +477,7 @@ DEPENDENCIES ember-rails ember-source (= 1.0.0.rc6.2) eventmachine - fabrication! + fabrication fakeweb (~> 1.3.0) fast_blank fast_xor!