Merge ee94805 into 21e9b9c

bwillis · May 8, 2017 · 7776f43 · 7776f43
2 parents 21e9b9c + ee94805
commit 7776f43
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 70 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,97 +10,95 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.0.0)
-      actionview (= 5.0.0)
-      activesupport (= 5.0.0)
+    actionpack (5.1.0)
+      actionview (= 5.1.0)
+      activesupport (= 5.1.0)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0)
-      activesupport (= 5.0.0)
+    actionview (5.1.0)
+      activesupport (= 5.1.0)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activesupport (5.0.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activesupport (5.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (2.1.0)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    builder (3.2.2)
-    concurrent-ruby (1.0.2)
-    coveralls (0.8.15)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    coveralls (0.8.21)
       json (>= 1.8, < 3)
-      simplecov (~> 0.12.0)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (>= 1.6.0, < 2)
-    diff-lcs (1.2.5)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    diff-lcs (1.3)
     docile (1.1.5)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    json (2.0.2)
+    erubi (1.6.0)
+    i18n (0.8.1)
+    json (2.1.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     method_source (0.8.2)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
-    nokogiri (1.6.8)
+    minitest (5.10.1)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    pkg-config (1.1.7)
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails-dom-testing (2.0.1)
+    rails-dom-testing (2.0.2)
       activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.0)
-      actionpack (= 5.0.0)
-      activesupport (= 5.0.0)
+    railties (5.1.0)
+      actionpack (= 5.1.0)
+      activesupport (= 5.1.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.1)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    simplecov (0.12.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    term-ansicolor (1.3.2)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tins (1.12.0)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tins (1.13.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -115,4 +113,4 @@ DEPENDENCIES
   versioncake!
 
 BUNDLED WITH
-   1.12.5
+   1.14.6
diff --git a/gemfiles/.bundle/config b/gemfiles/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"
diff --git a/gemfiles/rails3.2.gemfile b/gemfiles/rails3.2.gemfile
@@ -7,4 +7,4 @@ gem "activesupport", "~> 3.2.0"
 gem "railties", "~> 3.2.0"
 gem "test-unit", "~>3.0"
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/rails3.2.gemfile.lock b/gemfiles/rails3.2.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
     versioncake (3.2.0)
       actionpack (>= 3.2)
@@ -118,4 +118,4 @@ DEPENDENCIES
   versioncake!
 
 BUNDLED WITH
-   1.10.6
+   1.14.6
diff --git a/gemfiles/rails4.0.gemfile b/gemfiles/rails4.0.gemfile
@@ -7,4 +7,4 @@ gem "activesupport", "~> 4.0.0"
 gem "railties", "~> 4.0.0"
 gem "test-unit", "~>3.0"
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/rails4.0.gemfile.lock b/gemfiles/rails4.0.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
     versioncake (3.2.0)
       actionpack (>= 3.2)
@@ -99,4 +99,4 @@ DEPENDENCIES
   versioncake!
 
 BUNDLED WITH
-   1.10.6
+   1.14.6
diff --git a/gemfiles/rails4.1.gemfile b/gemfiles/rails4.1.gemfile
@@ -6,4 +6,4 @@ gem "actionpack", "~> 4.1.0"
 gem "activesupport", "~> 4.1.0"
 gem "railties", "~> 4.1.0"
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/rails4.1.gemfile.lock b/gemfiles/rails4.1.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
     versioncake (3.2.0)
       actionpack (>= 3.2)
@@ -103,4 +103,4 @@ DEPENDENCIES
   versioncake!
 
 BUNDLED WITH
-   1.10.6
+   1.14.6
diff --git a/gemfiles/rails4.2.gemfile b/gemfiles/rails4.2.gemfile
@@ -6,4 +6,4 @@ gem "actionpack", "~> 4.2.0"
 gem "activesupport", "~> 4.2.0"
 gem "railties", "~> 4.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/rails4.2.gemfile.lock b/gemfiles/rails4.2.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
     versioncake (3.2.0)
       actionpack (>= 3.2)
@@ -130,4 +130,4 @@ DEPENDENCIES
   versioncake!
 
 BUNDLED WITH
-   1.10.6
+   1.14.6
diff --git a/gemfiles/rails5.0.gemfile b/gemfiles/rails5.0.gemfile
@@ -6,4 +6,4 @@ gem "actionpack", "~> 5.0.0"
 gem "activesupport", "~> 5.0.0"
 gem "railties", "~> 5.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/rails5.0.gemfile.lock b/gemfiles/rails5.0.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
     versioncake (3.2.0)
       actionpack (>= 3.2)
@@ -118,4 +118,4 @@ DEPENDENCIES
   versioncake!
 
 BUNDLED WITH
-   1.12.5
+   1.14.6
diff --git a/spec/integration/controller/renders_controller_spec.rb b/spec/integration/controller/renders_controller_spec.rb
@@ -1,8 +1,7 @@
 require './spec/rails_helper'
 
 describe RendersController, type: :controller do
-  let(:request_options) { {} }
-  subject(:response_body) { get :index, request_options; response.body }
+  subject(:response_body) { get :index; response.body }
 
   context '#index' do
     render_views
@@ -60,7 +59,12 @@
     end
 
     context '#set_version' do
-      let(:request_options) { { 'override_version' => 1 } }
+      params_style = if ActionPack::VERSION::MAJOR >= 5
+        { params: { override_version: 1 } }
+      else
+        { override_version: 1 }
+      end
+      subject(:response_body) { get :index, params_style; response.body }
       let(:request_version) { 3 }
 
       it { expect(controller.request_version).to eq 1 }