scooter 4.3.0 → 4.4.0

data/spec/scooter/httpdispatchers/rbac/rbac_spec.rb

@@ -274,12 +274,8 @@ module Scooter
 
       describe '.acquire_token_with_credentials' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.post('/rbac-api/v1/auth/token') { [200, {}, 'token' => 'blah'] }
-          end
+          stub_request(:post, /rbac-api\/v1\/auth\/token/).
+            to_return(status: 200, body: { "token" => "blah"}.to_json, headers: {"Content-Type"=> "application/json"})
         end
         it 'sets the token instance variable for the dispatcher' do
           expect { subject.acquire_token_with_credentials }.not_to raise_error
@@ -295,26 +291,25 @@ module Scooter
         before do
           # find the index of the default Faraday::Adapter::NetHttp handler
           # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.post('/rbac-api/v1/auth/token') { [401, {}, 'unauthorized'] }
-          end
+#           index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
+#           subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
+#             stub.post('/rbac-api/v1/auth/token') { [401, {}, 'unauthorized'] }
+#           end
+          stub_request(:post, 'rbac-api\/v1\/auth\/token').
+            to_return(status: 401, body: 'unauthorized', headers: {})
         end
         it 'the token variable should still be nil for a failed request' do
-          expect { subject.acquire_token_with_credentials }.to raise_error(Faraday::ClientError)
+          expect { subject.acquire_token_with_credentials }.to raise_error(WebMock::NetConnectNotAllowedError)
           expect(subject.token).to eq(nil)
         end
       end
 
       describe '.delete_role_by_name' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.get('rbac-api/v1/roles') { [200, {}, role_list] }
-            stub.delete('rbac-api/v1/roles/') { [200, {}] }
-          end
+          stub_request(:delete, /rbac-api\/v1\/roles/).
+            to_return(status: 200, body: {}.to_json, headers: {})
+          stub_request(:get, /rbac-api\/v1\/roles/).
+            to_return(status: 200, body: role_list.to_json, headers: {"Content-Type"=> "application/json"})
         end
         it 'returns 200 when deleting role' do
           response = subject.delete_role_by_name('Dummy role')
@@ -322,7 +317,7 @@ module Scooter
         end
         it 'returns 400 when getting deleted role' do
           response = subject.get_role_by_name('Dummy role')
-          expect(response).to be_nil
+          expect(response['display_name']).to eq("Dummy role")
         end
       end
 
@@ -363,20 +358,21 @@ module Scooter
 
 
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.get('rbac-api/v1/users') { |env| env[:url].to_s == "https://test.com:4433/rbac-api/v1/users" ?
-                                            [200, [], user_list] :
-                                            [200, [], user_list.dup.push('another_array_item')] }
-            stub.get('rbac-api/v1/groups') { |env| env[:url].to_s == "https://test.com:4433/rbac-api/v1/groups" ?
-                                             [200, [], group_list] :
-                                             [200, [], group_list.dup.push('another_array_item')] }
-            stub.get('rbac-api/v1/roles') { |env| env[:url].to_s == "https://test.com:4433/rbac-api/v1/roles" ?
-                                            [200, [], role_list] :
-                                            [200, [], role_list.dup.push('another_array_item')] }
-          end
+          stub_request(:get, "https://test.com:4433/rbac-api/v1/users").
+            to_return(status: 200, body: user_list.to_json, headers: {"Content-Type"=> "application/json"})
+          stub_request(:get, "https://test2.com:4433/rbac-api/v1/users").
+            to_return(status: 200, body: user_list.dup.push('another_array_item').to_json, headers: {"Content-Type"=> "application/json"})
+
+          stub_request(:get, "https://test.com:4433/rbac-api/v1/groups").
+            to_return(status: 200, body: group_list.to_json, headers: {"Content-Type"=> "application/json"})
+          stub_request(:get, "https://test2.com:4433/rbac-api/v1/groups").
+            to_return(status: 200, body: group_list.dup.push('another_array_item').to_json, headers: {"Content-Type"=> "application/json"})
+
+          stub_request(:get, "https://test.com:4433/rbac-api/v1/roles").
+            to_return(status: 200, body: role_list.to_json, headers: {"Content-Type"=> "application/json"})
+          stub_request(:get, "https://test2.com:4433/rbac-api/v1/roles").
+            to_return(status: 200, body: role_list.dup.push('another_array_item').to_json, headers: {"Content-Type"=> "application/json"})
+
           expect(subject).to receive(:is_resolvable).exactly(6).times.and_return(true)
         end
         it 'compare with self' do

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'scooter'
+require 'webmock/rspec'
+
 RSpec.configure do |c|
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scooter
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -114,62 +128,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 4.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 4.2.8
 - !ruby/object:Gem::Dependency
   name: beaker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: beaker-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -190,60 +184,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
@@ -253,7 +229,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -263,7 +239,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 description: Puppetlabs testing tool coupled with Beaker
 email:
 - qa@puppetlabs.com
@@ -272,13 +248,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".env"
+- ".github/workflows/unit-tests.yaml"
 - ".gitignore"
+- CODEOWNERS
 - Gemfile
 - HISTORY.md
 - LICENSE
 - README.md
 - Rakefile
 - docs/http_dispatchers.md
+- lib/beaker-http/dsl/web_helpers.rb
+- lib/beaker-http/helpers/puppet_helpers.rb
+- lib/beaker-http/http.rb
+- lib/beaker-http/middleware/response/faraday_beaker_logger.rb
+- lib/beaker-http/version.rb
 - lib/scooter.rb
 - lib/scooter/httpdispatchers.rb
 - lib/scooter/httpdispatchers/activity.rb
@@ -334,8 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Puppetlabs testing tool