Ensure we don't pass both sameSite and same_site when adding cookie

quehanwei · Mar 18, 2020 · bed0e21 · bed0e21
1 parent ea9407b
commit bed0e21
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/rb/lib/selenium/webdriver/common/manager.rb b/rb/lib/selenium/webdriver/common/manager.rb
@@ -48,7 +48,10 @@ def add_cookie(opts = {})
 
         opts[:path] ||= '/'
         opts[:secure] ||= false
-        opts[:sameSite] = opts[:same_site] if opts[:same_site]
+
+        same_site = opts.delete(:same_site)
+        opts[:sameSite] = same_site if same_site
+
         obj = opts.delete(:expires)
         opts[:expiry] = seconds_from(obj).to_i if obj
 
@@ -170,8 +173,8 @@ def convert_cookie(cookie)
           path: cookie['path'],
           domain: cookie['domain'] && strip_port(cookie['domain']),
           expires: cookie['expiry'] && datetime_at(cookie['expiry']),
-          secure: cookie['secure'],
-          same_site: cookie['sameSite']
+          same_site: cookie['sameSite'],
+          secure: cookie['secure']
         }
       end
     end # Options