Skip to content

Commit

Permalink
Merge pull request #57 from zeisler/make_rails_5_work
Browse files Browse the repository at this point in the history
Rails 5.beta.x error
  • Loading branch information
zeisler committed May 1, 2016
2 parents 1372a8c + 7603311 commit fec07ef
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion active_mocker.gemspec
Expand Up @@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency "colorize", "~> 0.7"
spec.add_runtime_dependency "rake", ">= 10.0"
spec.add_runtime_dependency "reverse_parameters", "~> 0.4.0"
spec.add_runtime_dependency "active_record_schema_scrapper", "~> 0.2.1"
spec.add_runtime_dependency "active_record_schema_scrapper", "~> 0.2.2"
spec.add_runtime_dependency "dissociated_introspection", "~> 0.4.1"

spec.add_development_dependency "bundler", "~> 1.10"
Expand Down
5 changes: 3 additions & 2 deletions test_rails_4_app/gemfiles/rails_4.0.gemfile.lock
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ../../
specs:
active_mocker (2.1.3)
active_record_schema_scrapper (~> 0.2.1)
active_record_schema_scrapper (~> 0.2.2)
activesupport (~> 4.0)
colorize (~> 0.7)
dissociated_introspection (~> 0.4.1)
Expand Down Expand Up @@ -34,7 +34,8 @@ GEM
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
active_record_schema_scrapper (0.2.1)
active_record_schema_scrapper (0.2.2)
activerecord (>= 4.0, <= 5.9)
virtus (~> 1.0)
activejob (4.2.5)
activesupport (= 4.2.5)
Expand Down
5 changes: 3 additions & 2 deletions test_rails_4_app/gemfiles/rails_4.1.gemfile.lock
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ../../
specs:
active_mocker (2.1.3)
active_record_schema_scrapper (~> 0.2.1)
active_record_schema_scrapper (~> 0.2.2)
activesupport (~> 4.0)
colorize (~> 0.7)
dissociated_introspection (~> 0.4.1)
Expand Down Expand Up @@ -34,7 +34,8 @@ GEM
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
active_record_schema_scrapper (0.2.1)
active_record_schema_scrapper (0.2.2)
activerecord (>= 4.0, <= 5.9)
virtus (~> 1.0)
activejob (4.2.5)
activesupport (= 4.2.5)
Expand Down
5 changes: 3 additions & 2 deletions test_rails_4_app/gemfiles/rails_4.2.gemfile.lock
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ../../
specs:
active_mocker (2.1.3)
active_record_schema_scrapper (~> 0.2.1)
active_record_schema_scrapper (~> 0.2.2)
activesupport (~> 4.0)
colorize (~> 0.7)
dissociated_introspection (~> 0.4.1)
Expand Down Expand Up @@ -34,7 +34,8 @@ GEM
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
active_record_schema_scrapper (0.2.1)
active_record_schema_scrapper (0.2.2)
activerecord (>= 4.0, <= 5.9)
virtus (~> 1.0)
activejob (4.2.5)
activesupport (= 4.2.5)
Expand Down

0 comments on commit fec07ef

Please sign in to comment.