Controller generators should be creating IntegrationTest stubs instea… #22569

Merged
merged 1 commit into from Dec 13, 2015

Projects

None yet

2 participants

@seuros
Member
seuros commented Dec 13, 2015

…d of ControllerTest

closes #22076

@eileencodes eileencodes was assigned by seuros Dec 13, 2015
@eileencodes
Member

Travis failure appears unrelated, when I rebase with master it passes locally.

@eileencodes eileencodes merged commit 9712a7a into rails:master Dec 13, 2015

1 check failed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
@eileencodes
Member

Thanks @seuros! 😄

@seuros seuros deleted the seuros:remove-test-case branch Dec 13, 2015
@eileencodes eileencodes added a commit that referenced this pull request Dec 14, 2015
@eileencodes eileencodes Revert "Merge pull request #22569 from seuros/remove-test-case"
This reverts commit 9712a7a, reversing
changes made to 3e65c3d.

Reverting because this caused test failures and while we have a followup
branch there is still one failure that happens randomly and isn't
straight forward to fix.
2dd64a7
@tenderlove tenderlove added a commit to tenderlove/rails that referenced this pull request Dec 15, 2015
@tenderlove tenderlove Merge branch 'master' into rack2
* master: (351 commits)
  Fix travis matrix
  Add ruby-head back in the allow failures group
  Do now allow failures with Ruby 2.3 anymore
  Test with Ruby 2.3.0
  Revert "Perform a more efficient query in `Relation#any?`"
  Update seeds.rb.tt
  Perform a more efficient query in `Relation#any?`
  Fix test failures caused by 574f255
  `ActiveRecord::Base#becomes` should copy the errors
  Use a bind param for `LIMIT` and `OFFSET`
  Make Parameters#to_h and #to_unsafe_h return HWIA
  Deprecate limit strings with commas
  Revert "Merge pull request #22569 from seuros/remove-test-case"
  Implement Rake proxy for Rails' command line interface.
  Nodoc Rails command.
  Prevent a 500 in the default controller scaffold
  lazy load listen in core
  let config.file_watcher be the way to enable the evented file watcher
  Update web-console to 3.0.0
  [ci skip] Fix articles spelling.
  ...

Conflicts:
	actionpack/lib/action_dispatch/http/request.rb
	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
2c94e75
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment