Fixed tests [skip ci]

ankane · Sep 20, 2021 · 31d86b0 · 31d86b0
1 parent c47d7dc
commit 31d86b0
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 18 deletions.
diff --git a/Appraisals b/Appraisals
@@ -8,6 +8,7 @@ end
 
 appraise "activemerchant" do
   gem "activemerchant"
+  gem "rexml"
 end
 
 appraise "activerecord" do
@@ -34,6 +35,7 @@ end
 
 appraise "aws_sdk" do
   gem "aws-sdk-s3"
+  gem "rexml"
 end
 
 appraise "azure" do
@@ -54,6 +56,7 @@ end
 
 appraise "cassandra_driver" do
   gem "cassandra-driver"
+  gem "sorted_set"
 end
 
 appraise "clearbit" do

diff --git a/README.md b/README.md
@@ -645,10 +645,7 @@ Raises same exceptions as [elasticsearch](#elasticsearch)
 Typesense::Client.new(connection_timeout_seconds: 1)
 ```
 
-Raises
-
-- `Net::OpenTimeout` on connect timeout
-- `Net::ReadTimeout` on read timeout
+Raises `Typesense::Error::TimeoutError`
 
 ## HTTP Clients
 
@@ -1388,10 +1385,7 @@ Raises
 Slack::Web::Client.new(open_timeout: 1, timeout: 1)
 ```
 
-Raises
-
-- `Faraday::ConnectionFailed` on connect timeout
-- `Faraday::TimeoutError` on read timeout
+Raises `Slack::Web::Api::Errors::TimeoutError`
 
 ### smartystreets_ruby_sdk
 
@@ -1482,10 +1476,7 @@ Raises `ZendeskAPI::Error::NetworkError`
 Acme::Client.new(connection_options: {request: {open_timeout: 1, timeout: 1}})
 ```
 
-Raises
-
-- `Faraday::ConnectionFailed` on connect timeout
-- `Faraday::TimeoutError` on read timeout
+Raises `Acme::Client::Error::Timeout`
 
 ### actionmailer
 

diff --git a/gemfiles/activemerchant.gemfile b/gemfiles/activemerchant.gemfile
@@ -5,3 +5,4 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "minitest"
 gem "activemerchant"
+gem "rexml"
diff --git a/gemfiles/activemerchant.gemfile.lock b/gemfiles/activemerchant.gemfile.lock
@@ -27,6 +27,7 @@ GEM
       racc (~> 1.4)
     racc (1.5.2)
     rake (13.0.6)
+    rexml (3.2.5)
     thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -39,6 +40,7 @@ DEPENDENCIES
   activemerchant
   appraisal
   minitest
+  rexml
 
 BUNDLED WITH
    2.2.27
diff --git a/gemfiles/aws_sdk.gemfile b/gemfiles/aws_sdk.gemfile
@@ -5,3 +5,4 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "minitest"
 gem "aws-sdk-s3"
+gem "rexml"
diff --git a/gemfiles/aws_sdk.gemfile.lock b/gemfiles/aws_sdk.gemfile.lock
@@ -24,6 +24,7 @@ GEM
     jmespath (1.4.0)
     minitest (5.14.4)
     rake (13.0.6)
+    rexml (3.2.5)
     thor (1.1.0)
 
 PLATFORMS
@@ -33,6 +34,7 @@ DEPENDENCIES
   appraisal
   aws-sdk-s3
   minitest
+  rexml
 
 BUNDLED WITH
    2.2.27
diff --git a/gemfiles/cassandra_driver.gemfile b/gemfiles/cassandra_driver.gemfile
@@ -5,3 +5,4 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "minitest"
 gem "cassandra-driver"
+gem "sorted_set"
diff --git a/gemfiles/cassandra_driver.gemfile.lock b/gemfiles/cassandra_driver.gemfile.lock
@@ -10,6 +10,11 @@ GEM
     ione (1.2.4)
     minitest (5.14.4)
     rake (13.0.6)
+    rbtree (0.4.4)
+    set (1.0.1)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
     thor (1.1.0)
 
 PLATFORMS
@@ -19,6 +24,7 @@ DEPENDENCIES
   appraisal
   cassandra-driver
   minitest
+  sorted_set
 
 BUNDLED WITH
    2.2.27
diff --git a/test/acme_client_test.rb b/test/acme_client_test.rb
@@ -9,7 +9,7 @@ def test_connect
       connection_options: {request: {open_timeout: 1}}
     )
 
-    assert_timeout(Faraday::ConnectionFailed) do
+    assert_timeout(Acme::Client::Error::Timeout) do
       client.new_account(contact: "mailto:info@example.com", terms_of_service_agreed: true)
     end
   end
@@ -22,7 +22,7 @@ def test_read
       connection_options: {request: {timeout: 1}}
     )
 
-    assert_timeout(Faraday::TimeoutError) do
+    assert_timeout(Acme::Client::Error::Timeout) do
       client.new_account(contact: "mailto:info@example.com", terms_of_service_agreed: true)
     end
   end

diff --git a/test/slack_ruby_client_test.rb b/test/slack_ruby_client_test.rb
@@ -3,14 +3,14 @@
 class SlackRubyClientTest < Minitest::Test
   def test_connect
     client = Slack::Web::Client.new(endpoint: connect_url, open_timeout: 1)
-    assert_timeout(Faraday::ConnectionFailed) do
+    assert_timeout(Slack::Web::Api::Errors::TimeoutError) do
       client.auth_test
     end
   end
 
   def test_read
     client = Slack::Web::Client.new(endpoint: read_url, timeout: 1)
-    assert_timeout(Faraday::TimeoutError) do
+    assert_timeout(Slack::Web::Api::Errors::TimeoutError) do
       client.auth_test
     end
   end

diff --git a/test/typesense_test.rb b/test/typesense_test.rb
@@ -8,7 +8,7 @@ def test_connect
       connection_timeout_seconds: 1,
       num_retries: 0
     )
-    assert_timeout(Net::OpenTimeout) do
+    assert_timeout(Typesense::Error::TimeoutError) do
       client.collections.retrieve
     end
   end
@@ -20,7 +20,7 @@ def test_read
       connection_timeout_seconds: 1,
       num_retries: 0
     )
-    assert_timeout(Net::ReadTimeout) do
+    assert_timeout(Typesense::Error::TimeoutError) do
       client.collections.retrieve
     end
   end