Skip to content

Commit

Permalink
Merge 107eafa into 099e0da
Browse files Browse the repository at this point in the history
  • Loading branch information
bwillis committed Mar 11, 2020
2 parents 099e0da + 107eafa commit 3cdfef2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 17 deletions.
31 changes: 16 additions & 15 deletions Gemfile.lock
Expand Up @@ -32,36 +32,37 @@ GEM
bundler
rake
thor (>= 0.14.0)
builder (3.2.3)
concurrent-ruby (1.0.5)
builder (3.2.4)
concurrent-ruby (1.1.5)
coveralls (0.8.21)
json (>= 1.8, < 3)
simplecov (~> 0.14.1)
term-ansicolor (~> 1.3)
thor (~> 0.19.4)
tins (~> 1.6)
crass (1.0.5)
crass (1.0.6)
diff-lcs (1.3)
docile (1.1.5)
erubi (1.7.0)
i18n (0.8.6)
erubi (1.9.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.1.0)
loofah (2.3.1)
loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (0.9.0)
mini_portile2 (2.1.0)
minitest (5.10.3)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
rack (2.0.3)
mini_portile2 (2.4.0)
minitest (5.14.0)
nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
rack (2.1.1)
rack-test (0.7.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.1.4)
actionpack (= 5.1.4)
activesupport (= 5.1.4)
Expand Down Expand Up @@ -100,7 +101,7 @@ GEM
thor (0.19.4)
thread_safe (0.3.6)
tins (1.15.0)
tzinfo (1.2.3)
tzinfo (1.2.6)
thread_safe (~> 0.1)

PLATFORMS
Expand All @@ -115,4 +116,4 @@ DEPENDENCIES
versioncake!

BUNDLED WITH
1.16.3
2.0.2
4 changes: 2 additions & 2 deletions spec/integration/rack/middleware_regression_spec.rb
Expand Up @@ -27,7 +27,7 @@

it "test yml test cases" do
begin
_response_status, _response_headers, response = app.request(method, '/renders', headers.merge(params: params))
response = app.request(method, '/renders', headers.merge(params: params))
expect(response.body).to(eq(test_response), custom_message(headers, params, method, response.body, test_response))
rescue => e
raise custom_message(headers, params, method, response.body, test_response) + ", but it failed with an exception '#{e.message}'"
Expand All @@ -53,7 +53,7 @@ def custom_message(headers, params, method, actual_response, expected_response)

context 'and the request does not contain a version' do
it 'does not include a version (rails will convert nil => unversioned template)' do
_response_status, _response_headers, response = app.request('get', '/renders')
response = app.request('get', '/renders')
expect(response.body).to eq 'version is ' # nil
end
end
Expand Down

0 comments on commit 3cdfef2

Please sign in to comment.