ree_lib 1.0.86 → 1.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef4605f8eb48973a2e9ee1c9df9fbef06a4e8be6efe39e2ccd06bc2a945649c3
-  data.tar.gz: 20b1504401c0e996617499d3b9d595bfcfa124036341f0ca81641c7184da5309
+  metadata.gz: 5617079115b4c9fb7431a6d2e81d7eb34c378173809508312b6f58de711ae0fc
+  data.tar.gz: e0a0dc4c0dc92bab997e1ce44b4ea7d888ab616be535f011b3e5c9dbfb66a829
 SHA512:
-  metadata.gz: f6969edfb467a49fa80864d8d27701d2379d846ce2cec01ec80dc0da740978a834597687e2da47ddfb21ec8abbc44a9d7779418e53550fd3bb60237279583cd8
-  data.tar.gz: 463d80dd677fbba864d2c9c9130b88f523e52c0f49c4ee7632ef781ca8c9af5eec19f1230483509bcb981e91b360aa9072918ceaab091ab21bfbb32d207d21e5
+  metadata.gz: faa26811f3b74b634f7726887530bc106eea6576cf4ebc4496bba6f68f2e567c5a9511ea786396f1324a8474c539b40e64d8c12710b92e72d757b1a46727091e
+  data.tar.gz: 2543ee6346775abed1525a450ba6b203c09e618954092eafff0bda78d395674f3d2005b9f959abeac89bf5fdcfb9399c8b70c1bcb6ce37ddcc0b84622ddfa547

data/.ruby-version

@@ -1 +1 @@
-3.2.0
+3.3.0

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.86)
+    ree_lib (1.0.88)
+      bigdecimal (~> 3.1.6)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -14,46 +15,49 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    abbrev (0.1.2)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
+    bigdecimal (3.1.6)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.16.0)
+    bootsnap (1.17.0)
       msgpack (~> 1.2)
-    commander (4.6.0)
-      highline (~> 2.0.0)
+    commander (5.0.0)
+      highline (~> 3.0.0)
     concurrent-ruby (1.2.2)
     crack (0.4.5)
       rexml
     crass (1.0.6)
     debug_inspector (1.2.0)
     diff-lcs (1.5.0)
-    faker (3.2.0)
+    faker (3.2.2)
       i18n (>= 1.8.11, < 2)
-    hashdiff (1.0.1)
-    highline (2.0.3)
+    hashdiff (1.1.0)
+    highline (3.0.0)
+      abbrev
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    msgpack (1.6.0)
+    msgpack (1.7.2)
     nokogiri (1.16.0-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
     oj (3.13.23)
     pg (1.4.6)
-    public_suffix (5.0.1)
+    public_suffix (5.0.4)
     racc (1.7.3)
-    rack (3.0.5)
-    rack-test (2.0.2)
+    rack (3.0.8)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    ree (1.0.33)
-      commander (~> 4.6.0)
-    rexml (3.2.5)
+    rake (13.1.0)
+    ree (1.0.34)
+      commander (~> 5.0.0)
+    rexml (3.2.6)
     roda (3.58.0)
       rack
     rollbar (3.3.3)
@@ -61,23 +65,23 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     sequel (5.58.0)
     sqlite3 (1.4.4)
-    timecop (0.9.6)
+    timecop (0.9.8)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    webmock (3.18.1)
+    webmock (3.19.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -85,6 +89,7 @@ GEM
 PLATFORMS
   x86_64-darwin-19
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -103,4 +108,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.7
+   2.5.4

data/lib/ree_lib/packages/ree_dao/package/ree_dao/wrappers/pg_array.rb

@@ -8,12 +8,13 @@ class ReeDao::PgArray < ReeMapper::AbstractWrapper
     Kwargs[
       name: String,
       role: Nilor[Symbol, ArrayOf[Symbol]],
-      fields_filters: ArrayOf[ReeMapper::FieldsFilter]
+      fields_filters: ArrayOf[ReeMapper::FieldsFilter],
+      location: Nilor[String],
     ] => Or[Sequel::Postgres::PGArray, String]
   )
-  def db_dump(value, name:, role: nil, fields_filters: [])
+  def db_dump(value, name:, role: nil, fields_filters: [], location: nil)
     if !value.is_a?(Array)
-      raise ReeMapper::TypeError, "`#{name}` should be an array, got `#{truncate(value.inspect)}`"
+      raise ReeMapper::TypeError.new("`#{name}` should be an array, got `#{truncate(value.inspect)}`", location)
     end
 
     value = value.map.with_index do |el, index|
@@ -21,7 +22,8 @@ class ReeDao::PgArray < ReeMapper::AbstractWrapper
         el,
         name: "#{name}[#{index}]",
         role: role,
-        fields_filters: fields_filters + [subject.fields_filter]
+        fields_filters: fields_filters + [subject.fields_filter],
+        location: subject.location,
       )
     end
 
@@ -37,12 +39,13 @@ class ReeDao::PgArray < ReeMapper::AbstractWrapper
     Kwargs[
       name: String,
       role: Nilor[Symbol, ArrayOf[Symbol]],
-      fields_filters: ArrayOf[ReeMapper::FieldsFilter]
+      fields_filters: ArrayOf[ReeMapper::FieldsFilter],
+      location: Nilor[String],
     ] => Array
   ).throws(ReeMapper::TypeError)
-  def db_load(value, name:, role: nil, fields_filters: [])
+  def db_load(value, name:, role: nil, fields_filters: [], location: nil)
     if !value.is_a?(Sequel::Postgres::PGArray)
-      raise ReeMapper::TypeError, "`#{name}` should be a Sequel::Postgres::PGArray, got `#{truncate(value.inspect)}`"
+      raise ReeMapper::TypeError.new("`#{name}` should be a Sequel::Postgres::PGArray, got `#{truncate(value.inspect)}`", location)
     end
 
     value.map.with_index do |val, index|
@@ -50,7 +53,8 @@ class ReeDao::PgArray < ReeMapper::AbstractWrapper
         val,
         name: "#{name}[#{index}]",
         role: role,
-        fields_filters: fields_filters + [subject.fields_filter]
+        fields_filters: fields_filters + [subject.fields_filter],
+        location: subject.location,
       )
     end
   end

data/lib/ree_lib/packages/ree_dao/package/ree_dao/wrappers/pg_jsonb.rb

@@ -8,7 +8,8 @@ class ReeDao::PgJsonb < ReeMapper::AbstractWrapper
     Kwargs[
       name: String,
       role: Nilor[Symbol, ArrayOf[Symbol]],
-      fields_filters: ArrayOf[ReeMapper::FieldsFilter]
+      fields_filters: ArrayOf[ReeMapper::FieldsFilter],
+      location: Nilor[String],
     ] => Or[
       Sequel::Postgres::JSONBHash,
       Sequel::Postgres::JSONBArray,
@@ -20,18 +21,19 @@ class ReeDao::PgJsonb < ReeMapper::AbstractWrapper
       Sequel::Postgres::JSONBNull
     ]
   ).throws(ReeMapper::TypeError)
-  def db_dump(value, name:, role: nil, fields_filters: [])
+  def db_dump(value, name:, role: nil, fields_filters: [], location: nil)
     value = subject.type.db_dump(
       value,
       name: name,
       role: role,
-      fields_filters: fields_filters + [subject.fields_filter]
+      fields_filters: fields_filters + [subject.fields_filter],
+      location: subject.location,
     )
 
     begin
       Sequel.pg_jsonb_wrap(value)
     rescue Sequel::Error
-      raise ReeMapper::TypeError, "`#{name}` should be an jsonb primitive, got `#{truncate(value.inspect)}`"
+      raise ReeMapper::TypeError.new("`#{name}` should be an jsonb primitive, got `#{truncate(value.inspect)}`", location)
     end
   end
 
@@ -40,7 +42,8 @@ class ReeDao::PgJsonb < ReeMapper::AbstractWrapper
     Kwargs[
       name: String,
       role: Nilor[Symbol, ArrayOf[Symbol]],
-      fields_filters: ArrayOf[ReeMapper::FieldsFilter]
+      fields_filters: ArrayOf[ReeMapper::FieldsFilter],
+      location: Nilor[String],
     ] => Or[
       Hash,
       Array,
@@ -52,7 +55,7 @@ class ReeDao::PgJsonb < ReeMapper::AbstractWrapper
       Rational,
     ]
   ).throws(ReeMapper::TypeError)
-  def db_load(value, name:, role: nil, fields_filters: [])
+  def db_load(value, name:, role: nil, fields_filters: [], location: nil)
     value = case value
     when Sequel::Postgres::JSONBHash
       ReeObject::ToHash.new.call(value.to_h)
@@ -61,14 +64,15 @@ class ReeDao::PgJsonb < ReeMapper::AbstractWrapper
     when Numeric, String, TrueClass, FalseClass, NilClass
       value
     else
-      raise ReeMapper::TypeError, "`#{name}` should be a Sequel::Postgres::JSONB, got `#{truncate(value.inspect)}`"
+      raise ReeMapper::TypeError.new("`#{name}` should be a Sequel::Postgres::JSONB, got `#{truncate(value.inspect)}`", location)
     end
 
     subject.type.db_load(
       value,
       name: name,
       role: role,
-      fields_filters: fields_filters + [subject.fields_filter]
+      fields_filters: fields_filters + [subject.fields_filter],
+      location: subject.location,
     )
   end
 end

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/wrappers/pg_array_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe 'ReeDao::PgArray' do
     it {
       expect {
         mapper.db_dump({ tags: 1 })
-      }.to raise_error(ReeMapper::TypeError, "`tags` should be an array, got `1`")
+      }.to raise_error(ReeMapper::TypeError, /`tags` should be an array, got `1`/)
     }
   end
 
@@ -66,7 +66,7 @@ RSpec.describe 'ReeDao::PgArray' do
         mapper.db_load({
           tags: 1
         })
-      }.to raise_error(ReeMapper::TypeError, "`tags` should be a Sequel::Postgres::PGArray, got `1`")
+      }.to raise_error(ReeMapper::TypeError, /`tags` should be a Sequel::Postgres::PGArray, got `1`/)
     }
   end
-end
+end

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/wrappers/pg_jsonb_spec.rb

@@ -55,14 +55,14 @@ RSpec.describe 'ReeDao::PgJsonb' do
     it {
       expect {
         mapper.db_dump({ numbers: ['1'] })
-      }.to raise_error(ReeMapper::TypeError, "`numbers[0]` should be an integer, got `\"1\"`")
+      }.to raise_error(ReeMapper::TypeError, /`numbers\[0\]` should be an integer, got `\"1\"`/)
     }
 
     it {
       object = Object.new
       expect {
         mapper.db_dump({ any: object })
-      }.to raise_error(ReeMapper::TypeError, "`any` should be an jsonb primitive, got `#{object.inspect}`")
+      }.to raise_error(ReeMapper::TypeError, /`any` should be an jsonb primitive, got `#{object.inspect}`/)
     }
   end
 
@@ -88,14 +88,14 @@ RSpec.describe 'ReeDao::PgJsonb' do
     it {
       expect {
         mapper.db_load({ numbers: Sequel::Postgres::JSONBArray.new([1.1]) })
-      }.to raise_error(ReeMapper::TypeError, "`numbers[0]` should be an integer, got `1.1`")
+      }.to raise_error(ReeMapper::TypeError, /`numbers\[0\]` should be an integer, got `1.1`/)
     }
 
     it {
       object = Object.new
       expect {
         mapper.db_load({ numbers: object })
-      }.to raise_error(ReeMapper::TypeError, "`numbers` should be a Sequel::Postgres::JSONB, got `#{object.inspect}`")
+      }.to raise_error(ReeMapper::TypeError, /`numbers` should be a Sequel::Postgres::JSONB, got `#{object.inspect}`/)
     }
   end
 end

data/lib/ree_lib/packages/ree_enum/package/ree_enum/base_enum_mapper.rb

@@ -12,10 +12,10 @@ class ReeEnum::BaseEnumMapper < ReeMapper::AbstractType
     ReeEnum::Value,
     Kwargs[
       name: String,
-      role: Nilor[Symbol, ArrayOf[Symbol]]
+      location: Nilor[String],
     ] => Or[Integer, String]
   )
-  def db_dump(value, name:, role: nil)
+  def db_dump(value, name:, location: nil)
     value.mapped_value
   end
 
@@ -23,14 +23,14 @@ class ReeEnum::BaseEnumMapper < ReeMapper::AbstractType
     Or[Integer, String],
     Kwargs[
       name: String,
-      role: Nilor[Symbol, ArrayOf[Symbol]]
+      location: Nilor[String],
     ] => ReeEnum::Value
   ).throws(ReeMapper::CoercionError)
-  def db_load(value, name:, role: nil)
+  def db_load(value, name:, location: nil)
     enum_val = @enum.get_values.by_mapped_value(value)
 
     if !enum_val
-      raise ReeMapper::CoercionError, "`#{name}` should be one of #{enum_inspection}, got `#{truncate(value.inspect)}`"
+      raise ReeMapper::CoercionError.new("`#{name}` should be one of #{enum_inspection}, got `#{truncate(value.inspect)}`", location)
     end
 
     enum_val

data/lib/ree_lib/packages/ree_enum/package/ree_enum/integer_value_enum_mapper.rb

@@ -6,10 +6,10 @@ class ReeEnum::IntegerValueEnumMapper < ReeEnum::BaseEnumMapper
     ReeEnum::Value,
     Kwargs[
       name: String,
-      role: Nilor[Symbol, ArrayOf[Symbol]]
+      location: Nilor[String],
     ] => Integer
   )
-  def serialize(value, name:, role: nil)
+  def serialize(value, name:, location: nil)
     value.value
   end
 
@@ -17,10 +17,10 @@ class ReeEnum::IntegerValueEnumMapper < ReeEnum::BaseEnumMapper
     Any,
     Kwargs[
       name: String,
-      role: Nilor[Symbol, ArrayOf[Symbol]]
+      location: Nilor[String],
     ] => ReeEnum::Value
   ).throws(ReeMapper::CoercionError)
-  def cast(value, name:, role: nil)
+  def cast(value, name:, location: nil)
     enum_value = case value
     when Integer
       @enum.get_values.by_value(value)
@@ -34,7 +34,7 @@ class ReeEnum::IntegerValueEnumMapper < ReeEnum::BaseEnumMapper
     end
 
     if enum_value.nil?
-      raise ReeMapper::CoercionError, "`#{name}` should be one of #{enum_inspection}, got `#{truncate(value.inspect)}`"
+      raise ReeMapper::CoercionError.new("`#{name}` should be one of #{enum_inspection}, got `#{truncate(value.inspect)}`", location)
     end
 
     enum_value

data/lib/ree_lib/packages/ree_enum/package/ree_enum/string_value_enum_mapper.rb

@@ -6,10 +6,10 @@ class ReeEnum::StringValueEnumMapper < ReeEnum::BaseEnumMapper
     ReeEnum::Value,
     Kwargs[
       name: String,
-      role: Nilor[Symbol, ArrayOf[Symbol]]
+      location: Nilor[String],
     ] => String
   )
-  def serialize(value, name:, role: nil)
+  def serialize(value, name:, location: nil)
     value.value
   end
 
@@ -17,10 +17,10 @@ class ReeEnum::StringValueEnumMapper < ReeEnum::BaseEnumMapper
     Any,
     Kwargs[
       name: String,
-      role: Nilor[Symbol, ArrayOf[Symbol]]
+      location: Nilor[String],
     ] => ReeEnum::Value
   ).throws(ReeMapper::CoercionError)
-  def cast(value, name:, role: nil)
+  def cast(value, name:, location: nil)
     enum_value = case value
     when String
       @enum.get_values.by_value(value)
@@ -29,7 +29,7 @@ class ReeEnum::StringValueEnumMapper < ReeEnum::BaseEnumMapper
     end
 
     if enum_value.nil?
-      raise ReeMapper::CoercionError, "`#{name}` should be one of #{enum_inspection}, got `#{truncate(value.inspect)}`"
+      raise ReeMapper::CoercionError.new("`#{name}` should be one of #{enum_inspection}, got `#{truncate(value.inspect)}`", location)
     end
 
     enum_value

data/lib/ree_lib/packages/ree_enum/spec/ree_enum/dsl_spec.rb

@@ -152,7 +152,7 @@ RSpec.describe ReeEnum::DSL do
         type: 'invalid',
         number: 0,
       })
-    }.to raise_error(ReeMapper::CoercionError, '`type` should be one of ["account"], got `"invalid"`')
+    }.to raise_error(ReeMapper::CoercionError, /`type` should be one of \["account"\], got `"invalid"`/)
 
     expect {
       mapper.db_load({
@@ -160,7 +160,7 @@ RSpec.describe ReeEnum::DSL do
         type: 'invalid',
         number: 0,
       })
-    }.to raise_error(ReeMapper::CoercionError, '`type` should be one of ["account"], got `"invalid"`')
+    }.to raise_error(ReeMapper::CoercionError, /`type` should be one of \["account"\], got `"invalid"`/)
 
     expect(
       mapper.cast({
@@ -242,4 +242,4 @@ RSpec.describe ReeEnum::DSL do
       swagger_definition_fetcher.call(TestReeEnum::ContentTypes.type_for_mapper, -> {})
     )
   }
-end
+end

data/lib/ree_lib/packages/ree_http/package/ree_http/functions/execute_request.rb

@@ -4,13 +4,13 @@ class ReeHttp::ExecuteRequest
   include Ree::FnDSL
 
   fn :execute_request do
+    link :build_request
     link :build_request_executor
     link :slice, from: :ree_hash
-    link 'ree_http/http_exceptions', -> { HttpExceptions }
-
     link 'ree_http/constants', -> {
       DEFAULT_TIMEOUT & DEFAULT_WRITE_TIMEOUT & DEFAULT_FORCE_SSL
     }
+    link 'ree_http/http_exceptions', -> { HttpExceptions }
   end
 
   include HttpExceptions
@@ -89,7 +89,9 @@ class ReeHttp::ExecuteRequest
       "Got #{response.code} response on request URI #{request.uri}\n With BODY: #{response.body}\n"
     )
 
-    process_redirect_response(response, request, opts, &block)
+    if response.is_a?(Net::HTTPRedirection)
+      return process_redirect_response(response, request, opts, &block)
+    end
 
     response
   end
@@ -97,27 +99,32 @@ class ReeHttp::ExecuteRequest
   private
 
   def process_redirect_response(response, request, opts, &block)
-    if response.is_a?(Net::HTTPRedirection)
-      if opts[:redirects_count] == 0
-        raise TooManyRedirectsError, "Got too match redirects, if you want more redirects, use redirects_count"
-      end
+    if opts[:redirects_count] == 0
+      raise TooManyRedirectsError, "Got too match redirects, if you want more redirects, use redirects_count"
+    end
 
-      if opts[:strict_redirect_mode] && STRICT_SENSITIVE_CODES.include?(response.code.to_i) && UNSAFE_VERBS.include?(request.method.to_sym)
-        raise RedirectMethodError, "Got #{response.code.to_i} with strict_mode"
-      end
+    if opts[:strict_redirect_mode] && STRICT_SENSITIVE_CODES.include?(response.code.to_i) && UNSAFE_VERBS.include?(request.method.to_sym)
+      raise RedirectMethodError, "Got #{response.code.to_i} with strict_mode"
+    end
 
-      if (ALWAYS_GET_CODES.include?(response.code.to_i) || STRICT_SENSITIVE_CODES.include?(response.code.to_i)) && UNSAFE_VERBS.include?(request.method.downcase.to_sym)
-        request.instance_variable_set(:@method, 'GET')
-      end
+    if (ALWAYS_GET_CODES.include?(response.code.to_i) || STRICT_SENSITIVE_CODES.include?(response.code.to_i)) && UNSAFE_VERBS.include?(request.method.downcase.to_sym)
+      new_request_method = :get
+    end
 
-      request.instance_variable_set(:@uri, URI(response['Location']))
-      request.instance_variable_set(:@path, request.uri.path)
+    new_request_method ||= request.method.downcase.to_sym
 
-      opts[:redirects_count] -= 1
+    new_uri = URI(response['Location'] || response['location'])
+    new_request = build_request(
+      new_request_method,
+      new_uri.to_s,
+      **slice(opts, [
+          :headers, :body, :form_data, :query_params,
+          :force_ssl, :ca_certs, :basic_auth, :bearer_token
+      ])
+    )
 
-      return call(request, **opts, &block)
-    end
+    opts[:redirects_count] -= 1
 
-    response
+    call(new_request, **opts, &block)
   end
-end
+end

data/lib/ree_lib/packages/ree_http/schemas/ree_http/functions/execute_request.schema.json

@@ -34,6 +34,14 @@
     }
   ],
   "links": [
+    {
+      "target": "build_request",
+      "package_name": "ree_http",
+      "as": "build_request",
+      "imports": [
+
+      ]
+    },
     {
       "target": "build_request_executor",
       "package_name": "ree_http",

data/lib/ree_lib/packages/ree_http/spec/ree_http/functions/http_delete_spec.rb

@@ -129,11 +129,11 @@ RSpec.describe :http_delete do
           headers: {
             'Accept'=>'*/*',
             'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-            'User-Agent'=>'Ruby',
-            'Token'=>'123'
+            'Host' => 'www.example.com',
+            'User-Agent'=>'Ruby'
           }
         )
-        .to_return(status: 200, headers: {'Token': '123'})
+        .to_return(status: 200)
     end
     after :all do
       WebMock.reset!
@@ -142,7 +142,7 @@ RSpec.describe :http_delete do
     let(:err_result) {
       http_delete(
         host_with_ssl + '/redirect_303_infinity',
-        force_ssl: true, headers: { token: '123'}
+        force_ssl: true
       )
     }
 
@@ -151,15 +151,17 @@ RSpec.describe :http_delete do
 
       http_delete(
         host_with_ssl + '/redirect_307',
-        force_ssl: true, headers: { token: '123'}
+        force_ssl: true, headers: { "Token" => 123 }
       )
-      expect(WebMock).to have_requested(:delete, host_with_ssl).with(headers: { 'Token'=>'123' })
+      expect(WebMock).to have_requested(:delete, host_with_ssl + "/redirect_307").with(headers: { "Token" => 123}).once
+      expect(WebMock).to have_requested(:delete, host_with_ssl).once
 
       http_delete(
         host_with_ssl + '/redirect_303',
-        force_ssl: true, headers: { token: '123'}
+        force_ssl: true, headers: { "Token" => 123 }
       )
-      expect(WebMock).to have_requested(:get, host_with_ssl).with(headers: { 'Token'=>'123' })
+      expect(WebMock).to have_requested(:delete, host_with_ssl + "/redirect_303").with(headers: { "Token" => 123}).once
+      expect(WebMock).to have_requested(:get, host_with_ssl).once
     end
   end
 end