Fix tests (#59)

Faraday 1.0 has been released and we did a poor job of specifying the dependencies for the faraday tests so the 1.0 upgrade broke the faraday tests. Additionally while fixing this bundler failed to install rails due to resolving to sprockets 4 which requires ruby 2.5. - Update appraisal to specify faraday ~> 0 for the current tests - Add tests for faraday 1.0 - Specify a version of sprockets that support all of the versions of ruby that we test on
honeycombio · Jan 9, 2020 · c9a3ce1 · c9a3ce1
1 parent dd025b1
commit c9a3ce1
Show file tree

Hide file tree

Showing 10 changed files with 151 additions and 58 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -53,10 +53,14 @@ gemfiles:
     steps:
       - ruby:
           gemfile: gemfiles/aws_3.gemfile
-  faraday: &faraday
+  faraday-zero: &faraday-zero
     steps:
       - ruby:
-          gemfile: gemfiles/faraday.gemfile
+          gemfile: gemfiles/faraday_0.gemfile
+  faraday-one: &faraday-one
+    steps:
+      - ruby:
+          gemfile: gemfiles/faraday_1.gemfile
   sequel-four: &sequel-four
     steps:
       - ruby:
@@ -145,17 +149,29 @@ jobs:
   aws-three-ruby-two-six:
     <<: *aws-three
     executor: ruby-two-six
-  faraday-ruby-two-three:
-    <<: *faraday
+  faraday-zero-ruby-two-three:
+    <<: *faraday-zero
     executor: ruby-two-three
-  faraday-ruby-two-four:
-    <<: *faraday
+  faraday-zero-ruby-two-four:
+    <<: *faraday-zero
     executor: ruby-two-four
-  faraday-ruby-two-five:
-    <<: *faraday
+  faraday-zero-ruby-two-five:
+    <<: *faraday-zero
     executor: ruby-two-five
-  faraday-ruby-two-six:
-    <<: *faraday
+  faraday-zero-ruby-two-six:
+    <<: *faraday-zero
+    executor: ruby-two-six
+  faraday-one-ruby-two-three:
+    <<: *faraday-one
+    executor: ruby-two-three
+  faraday-one-ruby-two-four:
+    <<: *faraday-one
+    executor: ruby-two-four
+  faraday-one-ruby-two-five:
+    <<: *faraday-one
+    executor: ruby-two-five
+  faraday-one-ruby-two-six:
+    <<: *faraday-one
     executor: ruby-two-six
   sequel-four-ruby-two-three:
     <<: *sequel-four
@@ -339,19 +355,35 @@ workflows:
           <<: *tag_filters
           requires:
             - lint
-      - faraday-ruby-two-three:
+      - faraday-zero-ruby-two-three:
+          <<: *tag_filters
+          requires:
+            - lint
+      - faraday-zero-ruby-two-four:
+          <<: *tag_filters
+          requires:
+            - lint
+      - faraday-zero-ruby-two-five:
+          <<: *tag_filters
+          requires:
+            - lint
+      - faraday-zero-ruby-two-six:
+          <<: *tag_filters
+          requires:
+            - lint
+      - faraday-one-ruby-two-three:
           <<: *tag_filters
           requires:
             - lint
-      - faraday-ruby-two-four:
+      - faraday-one-ruby-two-four:
           <<: *tag_filters
           requires:
             - lint
-      - faraday-ruby-two-five:
+      - faraday-one-ruby-two-five:
           <<: *tag_filters
           requires:
             - lint
-      - faraday-ruby-two-six:
+      - faraday-one-ruby-two-six:
           <<: *tag_filters
           requires:
             - lint
@@ -543,10 +575,14 @@ workflows:
             - aws-three-ruby-two-four
             - aws-three-ruby-two-five
             - aws-three-ruby-two-six
-            - faraday-ruby-two-three
-            - faraday-ruby-two-four
-            - faraday-ruby-two-five
-            - faraday-ruby-two-six
+            - faraday-zero-ruby-two-three
+            - faraday-zero-ruby-two-four
+            - faraday-zero-ruby-two-five
+            - faraday-zero-ruby-two-six
+            - faraday-one-ruby-two-three
+            - faraday-one-ruby-two-four
+            - faraday-one-ruby-two-five
+            - faraday-one-ruby-two-six
             - sequel-four-ruby-two-three
             - sequel-four-ruby-two-four
             - sequel-four-ruby-two-five

diff --git a/Appraisals b/Appraisals
@@ -8,8 +8,12 @@ appraise "aws-3" do
   gem "aws-sdk", "~> 3"
 end
 
-appraise "faraday" do
-  gem "faraday"
+appraise "faraday-0" do
+  gem "faraday", "~> 0"
+end
+
+appraise "faraday-1" do
+  gem "faraday", "~> 1"
 end
 
 appraise "sequel4" do
@@ -35,30 +39,35 @@ end
 appraise "rails-41" do
   gem "rack-test"
   gem "rails", "~> 4.1.0"
+  gem "sprockets", "~> 3"
   gem "warden"
 end
 
 appraise "rails-42" do
   gem "rack-test"
   gem "rails", "~> 4.2.0"
+  gem "sprockets", "~> 3"
   gem "warden"
 end
 
 appraise "rails-5" do
   gem "rack-test"
   gem "rails", "~> 5.0.0"
+  gem "sprockets", "~> 3"
   gem "warden"
 end
 
 appraise "rails-51" do
   gem "rack-test"
   gem "rails", "~> 5.1.0"
+  gem "sprockets", "~> 3"
   gem "warden"
 end
 
 appraise "rails-52" do
   gem "rack-test"
   gem "rails", "~> 5.2.0"
+  gem "sprockets", "~> 3"
   gem "warden"
 end
 

diff --git a/gemfiles/faraday_0.gemfile b/gemfiles/faraday_0.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 0"
+
+gemspec path: "../"
diff --git a/gemfiles/faraday_1.gemfile b/gemfiles/faraday_1.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 1"
+
+gemspec path: "../"
diff --git a/gemfiles/rails_41.gemfile b/gemfiles/rails_41.gemfile
@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "rack-test"
 gem "rails", "~> 4.1.0"
+gem "sprockets", "~> 3"
 gem "warden"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_42.gemfile b/gemfiles/rails_42.gemfile
@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "rack-test"
 gem "rails", "~> 4.2.0"
+gem "sprockets", "~> 3"
 gem "warden"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "rack-test"
 gem "rails", "~> 5.0.0"
+gem "sprockets", "~> 3"
 gem "warden"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_51.gemfile b/gemfiles/rails_51.gemfile
@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "rack-test"
 gem "rails", "~> 5.1.0"
+gem "sprockets", "~> 3"
 gem "warden"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_52.gemfile b/gemfiles/rails_52.gemfile
@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "rack-test"
 gem "rails", "~> 5.2.0"
+gem "sprockets", "~> 3"
 gem "warden"
 
 gemspec path: "../"
diff --git a/spec/honeycomb/integrations/faraday_spec.rb b/spec/honeycomb/integrations/faraday_spec.rb
@@ -37,13 +37,21 @@
     end
 
     describe "supports various initialization methods" do
+      let(:current_faraday_version) { Gem::Version.new(Faraday::VERSION) }
+      let(:include_http_adapter) do
+        Gem::Dependency.new("", "~> 0").match?("", current_faraday_version)
+      end
+
       it "supports standard usage with no block" do
         f = Faraday.new("http://honeycomb.io")
-        expect(f.builder.handlers).to eq([
-                                           Faraday::Request::UrlEncoded,
-                                           Honeycomb::Faraday,
-                                           Faraday::Adapter::NetHttp,
-                                         ])
+        expected = [
+          Faraday::Request::UrlEncoded,
+          Honeycomb::Faraday,
+        ]
+
+        include_http_adapter && expected << Faraday::Adapter::NetHttp
+
+        expect(f.builder.handlers).to eq(expected)
       end
 
       it "supports providing a builder with a string key" do
@@ -53,11 +61,14 @@
         end
         f = Faraday.new("builder" => stack)
 
-        expect(f.builder.handlers).to eq([
-                                           Faraday::Request::Retry,
-                                           Honeycomb::Faraday,
-                                           Faraday::Adapter::NetHttp,
-                                         ])
+        expected = [
+          Faraday::Request::Retry,
+          Honeycomb::Faraday,
+        ]
+
+        include_http_adapter && expected << Faraday::Adapter::NetHttp
+
+        expect(f.builder.handlers).to eq(expected)
       end
 
       it "supports providing a builder with a symbol key" do
@@ -67,11 +78,14 @@
         end
         f = Faraday.new(builder: stack)
 
-        expect(f.builder.handlers).to eq([
-                                           Faraday::Request::Retry,
-                                           Honeycomb::Faraday,
-                                           Faraday::Adapter::NetHttp,
-                                         ])
+        expected = [
+          Faraday::Request::Retry,
+          Honeycomb::Faraday,
+        ]
+
+        include_http_adapter && expected << Faraday::Adapter::NetHttp
+
+        expect(f.builder.handlers).to eq(expected)
       end
 
       it "supports providing a builder that only has an adapter" do
@@ -80,10 +94,13 @@
         end
         f = Faraday.new(builder: stack)
 
-        expect(f.builder.handlers).to eq([
-                                           Honeycomb::Faraday,
-                                           Faraday::Adapter::NetHttp,
-                                         ])
+        expected = [
+          Honeycomb::Faraday,
+        ]
+
+        include_http_adapter && expected << Faraday::Adapter::NetHttp
+
+        expect(f.builder.handlers).to eq(expected)
       end
 
       it "supports providing a builder and a url" do
@@ -93,11 +110,14 @@
         end
         f = Faraday.new("https://example.com", builder: stack)
 
-        expect(f.builder.handlers).to eq([
-                                           Faraday::Request::Retry,
-                                           Honeycomb::Faraday,
-                                           Faraday::Adapter::NetHttp,
-                                         ])
+        expected = [
+          Faraday::Request::Retry,
+          Honeycomb::Faraday,
+        ]
+
+        include_http_adapter && expected << Faraday::Adapter::NetHttp
+
+        expect(f.builder.handlers).to eq(expected)
       end
 
       it "does not add honeycomb middleware if it is not needed" do
@@ -108,19 +128,25 @@
         # force the builder to lock the middleware stack
         f.builder.app
 
-        expect(f.builder.handlers).to eq([
-                                           Honeycomb::Faraday,
-                                           Faraday::Adapter::NetHttp,
-                                         ])
+        expected = [
+          Honeycomb::Faraday,
+        ]
+
+        include_http_adapter && expected << Faraday::Adapter::NetHttp
+
+        expect(f.builder.handlers).to eq(expected)
 
         f2 = Faraday.new(builder: stack)
         # force the builder to lock the middleware stack
         f2.builder.app
 
-        expect(f2.builder.handlers).to eq([
-                                            Honeycomb::Faraday,
-                                            Faraday::Adapter::NetHttp,
-                                          ])
+        expected = [
+          Honeycomb::Faraday,
+        ]
+
+        include_http_adapter && expected << Faraday::Adapter::NetHttp
+
+        expect(f2.builder.handlers).to eq(expected)
       end
 
       it "supports providing a builder and a block" do
@@ -132,12 +158,15 @@
           faraday.adapter Faraday.default_adapter
         end
 
-        expect(f.builder.handlers).to eq([
-                                           Faraday::Response::Logger,
-                                           Faraday::Request::UrlEncoded,
-                                           Honeycomb::Faraday,
-                                           Faraday::Adapter::NetHttp,
-                                         ])
+        expected = [
+          Faraday::Response::Logger,
+          Faraday::Request::UrlEncoded,
+          Honeycomb::Faraday,
+        ]
+
+        include_http_adapter && expected << Faraday::Adapter::NetHttp
+
+        expect(f.builder.handlers).to eq(expected)
       end
     end