Fix adding implicitly rendered namespaced template digests to ETags #25817

Merged
merged 1 commit into from Jul 13, 2016

Projects

None yet

3 participants

@javan
Member
javan commented Jul 13, 2016

Extends the fix from #25546 to namespaced controllers and their templates.

New test failing without this change:

$ bundle exec rake test TEST=test/controller/render_test.rb 
Run options: --seed 59446

# Running:

.....S...............................F.......................

Finished in 0.498034s, 122.4816 runs/s, 614.4159 assertions/s.

  1) Failure:
NamespacedEtagRenderTest#test_etag_reflects_template_digest [.../actionpack/test/controller/render_test.rb:611]:
Expected response to be a <200: ok>, but was a <304: Not Modified>.
Expected: 200
  Actual: 304

61 runs, 306 assertions, 1 failures, 0 errors, 1 skips

/cc @jeremy

@javan javan Fix adding implicitly rendered namespaced template digests to ETags
03efd17
@javan javan added the actionpack label Jul 13, 2016
@maclover7
Member

On a quick glance, this looks like it could be related to #20333?

@javan
Member
javan commented Jul 13, 2016

Yeah, looks like the same issue, but could be referencing an older implementation. Either way, this should fix #20333.

@rafaelfranca rafaelfranca merged commit 853a041 into rails:master Jul 13, 2016

2 checks passed

codeclimate Code Climate didn't find any new or fixed issues.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@rafaelfranca
Member
rafaelfranca commented Jul 13, 2016 edited

Backported in e3a43ec

@philipqnguyen philipqnguyen added a commit to philipqnguyen/rails that referenced this pull request Sep 22, 2016
@philipqnguyen philipqnguyen Add #25546 and #25817 to changelog. 6270a00
@philipqnguyen philipqnguyen added a commit to philipqnguyen/rails that referenced this pull request Sep 22, 2016
@philipqnguyen philipqnguyen Add #25546 and #25817 to changelog [ci skip] 3bcc84b
@philipqnguyen philipqnguyen added a commit to philipqnguyen/rails that referenced this pull request Sep 23, 2016
@philipqnguyen philipqnguyen Add #25546 and #25817 to changelog [ci skip] 6d67c0e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment