Refactor cookies, headers and set cookie headers

Author: aguspe

rb/lib/selenium/webdriver/bidi/network/cookies.rb

@@ -21,35 +21,29 @@ module Selenium
   module WebDriver
     class BiDi
       class Cookies
-        def initialize
-          @cookies = {}
+        def initialize(cookies = {})
+          @cookies = cookies
         end
 
         def all
           @cookies
         end
 
-        def add_cookie(name, value)
-          @cookies[name] = value
-        end
-
-        def remove_cookie(name)
-          @cookies.delete(name)
-        end
-
         def []=(key, value)
-          add_cookie(key, value)
+          @cookies[key] = value
         end
 
         def [](key)
           @cookies[key]
         end
 
         def delete(key)
-          remove_cookie(key)
+          @cookies.delete(key)
         end
 
         def serialize
+          return [] unless @cookies
+
           @cookies.map do |name, value|
             {
               name: name.to_s,
@@ -61,6 +55,8 @@ def serialize
           end
         end
       end
-    end # BiDi
+    end
+
+    # BiDi
   end # WebDriver
 end # Selenium

rb/lib/selenium/webdriver/bidi/network/headers.rb

@@ -29,24 +29,16 @@ def all
           @headers
         end
 
-        def add_header(name, value)
-          @headers[name] = value
-        end
-
-        def remove_header(name)
-          @headers.delete(name)
-        end
-
         def []=(key, value)
-          add_header(key, value)
+          @headers[key] = value
         end
 
         def [](key)
           @headers[key]
         end
 
         def delete(key)
-          remove_header(key)
+          @headers.delete(key)
         end
 
         def serialize

rb/lib/selenium/webdriver/bidi/network/intercepted_request.rb

@@ -61,8 +61,8 @@ def headers
           @headers ||= Headers.new
         end
 
-        def cookies
-          @cookies ||= Cookies.new
+        def cookies(cookies = {})
+          @cookies ||= Cookies.new(cookies)
         end
       end
     end # BiDi

rb/lib/selenium/webdriver/bidi/network/intercepted_response.rb

@@ -50,7 +50,7 @@ def headers
           @headers ||= Headers.new
         end
 
-        def set_cookie_headers(set_cookie_headers = nil)
+        def set_cookie_headers(set_cookie_headers = {})
           @set_cookie_headers ||= SetCookieHeaders.new(set_cookie_headers)
         end
       end

rb/lib/selenium/webdriver/bidi/network/set_cookie_headers.rb

@@ -21,49 +21,24 @@ module Selenium
   module WebDriver
     class BiDi
       class SetCookieHeaders
-        def initialize(set_cookie_headers)
+        def initialize(set_cookie_headers = {})
           @set_cookie_headers = set_cookie_headers
         end
 
         def all
           @set_cookie_headers
         end
 
-        def add_set_cookie_header(name, value)
-          @set_cookie_headers[name] = {value: value}
-        end
-
-        def remove_set_cookie_header(name)
-          @set_cookie_headers.delete(name)
-        end
-
-        def set_cookie_header(**args)
-          set_cookie_header = args[:name]
-
-          set_cookie_header_data = {
-            value: 'input',
-            domain: args[:domain],
-            httpOnly: args[:http_only],
-            expiry: args[:expiry],
-            maxAge: args[:max_age],
-            path: args[:path],
-            sameSite: args[:same_site],
-            secure: args[:secure]
-          }
-
-          @set_cookie_headers[set_cookie_header] = set_cookie_header_data
-        end
-
         def []=(key, value)
-          add_set_cookie_header(key, value)
+          @set_cookie_headers[key] = {value: value}
         end
 
         def [](key)
           @set_cookie_headers[key]
         end
 
         def delete(key)
-          remove_set_cookie_header(key)
+          @set_cookie_headers.delete(key)
         end
 
         def serialize

rb/sig/lib/selenium/webdriver/bidi/network/cookies.rbs

@@ -4,14 +4,10 @@ module Selenium
       class Cookies
         @cookies: untyped
 
-        def initialize: () -> void
+        def initialize: (untyped cookies) -> void
 
         def all: () -> untyped
 
-        def add_cookie: (untyped name, untyped value) -> untyped
-
-        def remove_cookie: (untyped name) -> untyped
-
         def []=: (untyped key, untyped value) -> untyped
 
         def []: (untyped key) -> untyped

rb/sig/lib/selenium/webdriver/bidi/network/headers.rbs

@@ -8,10 +8,6 @@ module Selenium
 
         def all: () -> untyped
 
-        def add_header: (untyped name, untyped value) -> untyped
-
-        def remove_header: (untyped name) -> untyped
-
         def []=: (untyped key, untyped value) -> untyped
 
         def []: (untyped key) -> untyped

rb/sig/lib/selenium/webdriver/bidi/network/set_cookie_headers.rbs

@@ -0,0 +1,23 @@
+module Selenium
+  module WebDriver
+    class BiDi
+      class SetCookieHeaders
+        @set_cookie_headers: untyped
+
+        def initialize: (untyped set_cookie_headers) -> void
+
+        def all: () -> untyped
+
+        def set_cookie_header: (**untyped args) -> untyped
+
+        def []=: (untyped key, untyped value) -> untyped
+
+        def []: (untyped key) -> untyped
+
+        def delete: (untyped key) -> untyped
+
+        def serialize: () -> (::Array[untyped] | untyped)
+      end
+    end
+  end
+end

rb/spec/unit/selenium/webdriver/bidi/cookies_spec.rb

@@ -27,40 +27,46 @@ class BiDi
         let(:cookies) { described_class.new }
 
         describe '#initialize' do
-          it 'initializes an empty cookies hash' do
+          it 'initializes with an empty hash by default' do
             expect(cookies.all).to eq({})
           end
+
+          it 'stores the passed cookie hash internally' do
+            my_hash = {'foo' => {value: 'bar'}}
+            cookie_headers = described_class.new(my_hash)
+            expect(cookie_headers.all).to eq(my_hash)
+          end
         end
 
         describe '#all' do
           it 'returns the underlying cookies hash' do
-            cookies.add_cookie('session_id', 'abc123')
+            cookies['session_id'] = 'abc123'
             expect(cookies.all).to eq({'session_id' => 'abc123'})
           end
         end
 
         describe '#add_cookie' do
           it 'adds a cookie to the internal store' do
-            cookies.add_cookie('foo', 'bar')
+            cookies['foo'] = 'bar'
             expect(cookies['foo']).to eq('bar')
           end
 
           it 'updates an existing cookie if the name already exists' do
-            cookies.add_cookie('foo', 'bar')
-            cookies.add_cookie('foo', 'baz')
+            cookies['foo'] = 'bar'
+            cookies['foo'] = 'baz'
             expect(cookies['foo']).to eq('baz')
           end
         end
 
         describe '#remove_cookie' do
           it 'removes a cookie by name' do
-            cookies.add_cookie('foo', 'bar')
-            cookies.remove_cookie('foo')
+            cookies['foo'] = 'bar'
+            cookies.delete('foo')
             expect(cookies['foo']).to be_nil
           end
 
           it 'does not raise an error if cookie does not exist' do
-            expect { cookies.remove_cookie('non_existent') }.not_to raise_error
+            expect { cookies.delete('non_existent') }.not_to raise_error
           end
         end
 
@@ -93,7 +99,7 @@ class BiDi
         describe '#serialize' do
           it 'returns an array of cookie hashes in the minimal format' do
             cookies['key4'] = 'value4'
-            cookies.add_cookie('session_id', 'xyz123')
+            cookies['session_id'] = 'xyz123'
 
             serialized = cookies.serialize
             expect(serialized).to be_an(Array)

rb/spec/unit/selenium/webdriver/bidi/headers_spec.rb

@@ -34,33 +34,33 @@ class BiDi
 
         describe '#all' do
           it 'returns the underlying headers hash' do
-            headers.add_header('Authorization', 'Bearer abc123')
+            headers['Authorization'] = 'Bearer abc123'
             expect(headers.all).to eq({'Authorization' => 'Bearer abc123'})
           end
         end
 
         describe '#add_header' do
           it 'adds a header to the internal store' do
-            headers.add_header('Content-Type', 'application/json')
+            headers['Content-Type'] = 'application/json'
             expect(headers['Content-Type']).to eq('application/json')
           end
 
           it 'updates an existing header if the name already exists' do
-            headers.add_header('Content-Type', 'text/html')
-            headers.add_header('Content-Type', 'application/json')
+            headers['Content-Type'] = 'text/html'
+            headers['Content-Type'] = 'application/json'
             expect(headers['Content-Type']).to eq('application/json')
           end
         end
 
         describe '#remove_header' do
           it 'removes a header by name' do
-            headers.add_header('X-Custom-Header', 'foo')
-            headers.remove_header('X-Custom-Header')
+            headers['X-Custom-Header'] = 'foo'
+            headers.delete('X-Custom-Header')
             expect(headers['X-Custom-Header']).to be_nil
           end
 
           it 'does not raise an error if header does not exist' do
-            expect { headers.remove_header('Non-Existent') }.not_to raise_error
+            expect { headers.delete('Non-Existent') }.not_to raise_error
           end
         end
 
@@ -96,7 +96,7 @@ class BiDi
         describe '#serialize' do
           it 'returns an array of header hashes in the correct format' do
             headers['Accept'] = 'application/json'
-            headers.add_header('User-Agent', 'MyAgent/1.0')
+            headers['User-Agent'] = 'MyAgent/1.0'
 
             serialized = headers.serialize
             expect(serialized).to be_an(Array)