diff --git a/Gemfile b/Gemfile index d765649e..a592ff52 100644 --- a/Gemfile +++ b/Gemfile @@ -66,7 +66,7 @@ end group :test do # Pull in the fix for rails-dom-testing issue #42 # TODO: Remove with Rails 5 and rails-dom-testing 2.x - gem 'rails-dom-testing', github: 'rails/rails-dom-testing', ref: 'a64f30514ee65f172c43f42cfd4500b5e11a561a' + gem 'rails-dom-testing', :git => 'https://github.com/rails/rails-dom-testing', :ref => 'a64f30514ee65f172c43f42cfd4500b5e11a561a' gem "factory_girl_rails" gem "capybara" diff --git a/Gemfile.lock b/Gemfile.lock index 1870ee0b..633bbbdc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GIT - remote: https://github.com/rails/rails-dom-testing.git + remote: https://github.com/rails/rails-dom-testing revision: a64f30514ee65f172c43f42cfd4500b5e11a561a ref: a64f30514ee65f172c43f42cfd4500b5e11a561a specs: @@ -12,7 +12,8 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.3.2) - aasm (3.4.0) + aasm (4.12.3) + concurrent-ruby (~> 1.0) actionmailer (4.2.10) actionpack (= 4.2.10) actionview (= 4.2.10) @@ -55,9 +56,8 @@ GEM public_suffix (>= 2.0.2, < 4.0) arel (6.0.4) ast (2.4.0) - autoprefixer-rails (8.6.3) + autoprefixer-rails (9.0.0) execjs - backports (3.11.3) bcrypt (3.1.12) bootstrap-sass (3.3.3) autoprefixer-rails (>= 5.0.0.1) @@ -87,7 +87,6 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) - contracts (0.16.0) crass (1.0.4) daemons (1.2.6) database_cleaner (1.7.0) @@ -104,17 +103,17 @@ GEM ffi (1.9.25) font-awesome-sass (4.5.0) sass (>= 3.2) - gherkin (5.1.0) globalid (0.4.1) activesupport (>= 4.2.0) htmlentities (4.3.4) i18n (0.9.5) concurrent-ruby (~> 1.0) jaro_winkler (1.5.1) - jquery-rails (3.1.3) - railties (>= 3.0, < 5.0) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.1.0) libv8 (3.16.14.19) @@ -133,10 +132,8 @@ GEM mini_portile2 (2.1.0) minitest (5.11.3) minitest-stub-const (0.6) - mocha (1.5.0) + mocha (1.6.0) metaclass (~> 0.0.1) - multi_json (1.13.1) - multi_test (0.1.2) mysql2 (0.3.21) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) @@ -149,7 +146,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.12.1) - parser (2.5.1.0) + parser (2.5.1.2) ast (~> 2.4.0) powerpack (0.1.2) pry (0.11.3) @@ -195,10 +192,10 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.7.0) rspec-support (3.7.1) - rubocop (0.57.2) + rubocop (0.58.2) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5) + parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) @@ -206,11 +203,11 @@ GEM ruby-progressbar (1.9.0) rubyzip (1.2.1) safe_yaml (1.0.4) - sanitize (4.6.5) + sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) - sass (3.5.6) + sass (3.5.7) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -260,7 +257,7 @@ GEM safe_yaml (>= 0.8.6) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.11) + uglifier (4.1.16) execjs (>= 0.3.0, < 3) unicode-display_width (1.4.0) uniform_notifier (1.11.0) @@ -268,7 +265,7 @@ GEM will_paginate (3.1.6) xpath (2.1.0) nokogiri (~> 1.3) - yard (0.9.14) + yard (0.9.15) PLATFORMS ruby @@ -317,4 +314,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.16.1 + 1.16.2