1. 20 8月, 2016 1 次提交
    • S
      Allow the `integration_sesion` to be set early on ActionDispatch::Integration::Runner. · a887c9cb
      Sam Phippen 提交于
      In commit fa634484, @tenderlove changed
      the behaviour of the way `integration_session` is set up in this object.
      It used to be the case that the first time it was accessed, it was
      memoized with nil, however, this means that if it had already been set
      it was not replaced. After that commit, it is now always set to `nil` in
      the execution of `before_setup`.
      
      In RSpec, users are able to invoke `host!` in `before(:all)` blocks,
      which execute well before `before_setup` is ever invoked (which happens
      in what is equivalent to a `before(:each)` block, for each test. `host!`
      causes the integration session to be set up to correctly change the
      host, but after fa634484 the
      `integration_session` gets overwritten, meaning that users lose their
      `host!` configuration (see https://github.com/rspec/rspec-rails/issues/1662).
      
      This commit changes the behaviour back to memoizing with `nil`, as
      opposed to directly overwriting with `nil`. This causes the correct
      behaviour to occur in RSpec, and unless I'm mistaken will also ensure
      that users who want to modify their integration sessions early in rails
      will also be able to do so.
      a887c9cb
  2. 19 8月, 2016 2 次提交
  3. 18 8月, 2016 2 次提交
    • R
      Change method visibility to be private · 6568cfd7
      Rafael Mendonça França 提交于
      Those methods are only using inside this module and by a private method
      so they all should be private.
      6568cfd7
    • R
      Push :defaults extraction down one level · 4c91c442
      Rafael Mendonça França 提交于
      Since e852daa6 only the verb methods
      where extracting the defaults options. It was merged a fix for the
      `root` method in 31fbbb7f but `match`
      was still broken since `:defaults` where not extracted.
      
      This was causing routes defined using `match` and having the `:defaults`
      keys to not be recognized.
      
      To fix this it was extracted a new private method with the actual
      content of `match` and the `:defaults` extracting was moved to `match`.
      4c91c442
  4. 17 8月, 2016 1 次提交
    • P
      Start documenting ActionController::TestCase again · b556e2b4
      Prathamesh Sonpatki 提交于
      - Rails 5 changed interface for passing arguments to request methods to
        keyword args for AC::TestCase but also hid the documentation.
      - But existing AC::TestCase tests need the new documentation about
        keyword args. So resurrected documentation and added a note about not
        using this for new tests.
      - The guides and other documentation is already updated to use
        `ActionDispatch::IntegrationTest`.
      
      [Matthew Draper, Prathamesh Sonpatki]
      b556e2b4
  5. 16 8月, 2016 2 次提交
  6. 15 8月, 2016 2 次提交
  7. 14 8月, 2016 2 次提交
  8. 13 8月, 2016 3 次提交
  9. 11 8月, 2016 1 次提交
  10. 10 8月, 2016 3 次提交
  11. 09 8月, 2016 1 次提交
  12. 08 8月, 2016 3 次提交
    • X
      code gardening: removes redundant selfs · a9dc4545
      Xavier Noria 提交于
      A few have been left for aesthetic reasons, but have made a pass
      and removed most of them.
      
      Note that if the method `foo` returns an array, `foo << 1`
      is a regular push, nothing to do with assignments, so
      no self required.
      a9dc4545
    • K
      Add back unintentionally removed newline. · 3def3c50
      Kasper Timm Hansen 提交于
      3def3c50
    • S
      Modify LogSubscriber for single partial's cache message. · ab2af4df
      Stan Lo 提交于
      Implement naive partial caching mechanism.
      
      Add test for LogSubscriber
      
      Use ActionView::Base#log_payload to store log_subscriber's payload, so we can pass cache result into it.
      
      Fixed tests
      
      Remove useless settings
      
      Check if #log_payload exists before calling it. Because other classes also includes CacheHelper but don't have is attribute
      
      Use @log_payload_for_partial_reder instead of #log_payload to carry ActionView's payload.
      
      Update test's hash syntax
      
      Add configuration to enable/disable fragment caching logging
      
      Remove unless test and add new test to ensure cache info won't effect next rendering's log
      
      Move :enable_fragment_cache_logging config from ActionView to ActionPack
      
      Apply new config to tests
      
      Update actionview's changelog
      
      Update configuration guide
      
      Improve actionview's changelog
      
      Refactor PartialRenderer#render and log tests
      
      Mute subscriber's log instead of disabling instrumentation.
      
      Fix typo, remove useless comment and use new hash syntax
      
      Improve actionpack's log_subscriber test
      
      Fix rebase mistake
      
      Apply new config to all caching intstrument actions
      ab2af4df
  13. 07 8月, 2016 7 次提交
  14. 06 8月, 2016 1 次提交
    • E
      Fix GET JSON integration test request to use method override · af1680f5
      eileencodes 提交于
      When a `GET` request is sent `as: :json` in an integration test the test
      should use Rack's method override to change to a post request so the
      paramters are included in the postdata. Otherwise it will not encode the
      parameters correctly for the integration test.
      
      Because integration test sets up it's own middleware,
      `Rack::MethodOverride` needs to be included in the integration tests as
      well.
      
      `headers ||= {}` was moved so that headers are never nil. They should
      default to a hash.
      
      Fixes #26033
      
      [Eileen M. Uchitelle & Aaron Patterson]
      af1680f5
  15. 02 8月, 2016 4 次提交
    • K
      Move the YAML hook closer to `init_with`. · b71732c8
      Kasper Timm Hansen 提交于
      Looked odd, so completely detached from the other necessary part of
      the implementation.
      b71732c8
    • K
      Replace implicit formats with a case statement. · 0e0cff0f
      Kasper Timm Hansen 提交于
      The coder that Psych passes in has a `tag` method we can use to detect
      which serialization format we're reviving for. Use it and make it clearer
      alongside the `load_tags` fiddling.
      0e0cff0f
    • K
      Let Psych 2.0.9+ deserialize 2.0.8 serialized parameters. · 6eb97823
      Kasper Timm Hansen 提交于
      If we were to serialize an `ActionController::Parameters` on Psych 2.0.8, we'd get:
      
      ```yaml
      --- !ruby/hash:ActionController::Parameters
      key: :value
      ```
      
      Because 2.0.8 didn't store instance variables, while 2.0.9 did:
      https://github.com/tenderlove/psych/commit/8f84ad0fc711a82a1040def861cb121e8985fd4c
      
      That, coupled with 2.0.8 calling `new` instead of `allocate` meant parameters was
      deserialized just fine:
      https://github.com/tenderlove/psych/commit/af308f8307899cb9e1c0fffea4bce3110a1c3926
      
      However, if users have 2.0.8 serialized parameters, then upgrade to Psych 2.0.9+ and
      Rails 5, it would start to blow up because `initialize` will never be called, and thus
      `@parameters` will never be assigned. Hello, `NoMethodErrors` on `NilClass`! :)
      
      To fix this we register another variant of the previous serialization format and take
      it into account in `init_with`.
      
      I've tested this in our app and previously raising code now deserializes like a champ.
      I'm unsure how to test this in our suite because we use Psych 2.0.8 and don't know how
      to make us use 2.0.9+ for just one test.
      6eb97823
    • K
      Make Parameters support legacy YAML encodings. · 31448f2b
      Kasper Timm Hansen 提交于
      By changing ActionController::Parameter's superclass, Rails 5 also changed
      the YAML serialization format.
      
      Since YAML doesn't know how to handle parameters it would fallback to its
      routine for the superclass, which in Rails 4.2 was Hash while just Object
      in Rails 5. As evident in the tags YAML would spit out:
      
      4.2: !ruby/hash-with-ivars:ActionController::Parameters
      5.0: !ruby/object:ActionController::Parameters
      
      Thus when loading parameters YAML from 4.2 in Rails 5, it would parse a
      hash dump as it would an Object class.
      
      To fix this we have to provide our own `init_with` to be aware of the past
      format as well as the new one. Then we add a `load_tags` mapping, such that
      when the YAML parser sees `!ruby/hash-with-ivars:ActionController::Parameters`,
      it knows to call our `init_with` function and not try to instantiate it as
      a normal hash subclass.
      31448f2b
  16. 28 7月, 2016 1 次提交
    • N
      Reset rack.input when the environment is scrubbed for the next request · 40758347
      Nick Sieger 提交于
      Before this change, posted parameters would leak across requests. The included
      test case failed like so:
      
            1) Failure:
          TestCaseTest#test_multiple_mixed_method_process_should_scrub_rack_input:
          --- expected
          +++ actual
          @@ -1 +1 @@
          -{"bar"=>"an bar", "controller"=>"test_case_test/test", "action"=>"test_params"}
          +{"foo"=>"an foo", "bar"=>"an bar", "controller"=>"test_case_test/test", "action"=>"test_params"}
      
      An argument could be made that this situation isn't encountered often and that
      one should limit the number of requests per test case, but I still think the
      parameter leaking is an unexpected side-effect.
      40758347
  17. 27 7月, 2016 2 次提交
  18. 25 7月, 2016 1 次提交
  19. 22 7月, 2016 1 次提交
    • C
      Fix 'defaults' option for root route · 31fbbb7f
      Chris Arcand 提交于
      The merging of the 'defaults' option was moved up the stack in e852daa6
      This allows us to see where these options originate from the standard
      HttpHelpers (get, post, patch, put, delete)
      
      Unfortunately this move didn't incorporate the 'root' method, which has
      always allowed the same 'defaults' option before.
      31fbbb7f