From 3966bfe9f664bfecf0392bd973e15bc7d1671ad3 Mon Sep 17 00:00:00 2001 From: Pallavi Date: Thu, 16 Jan 2025 18:50:54 +0530 Subject: [PATCH 1/9] handled nil condition for Cookie Method in ruby --- rb/lib/selenium/webdriver/remote/bridge.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rb/lib/selenium/webdriver/remote/bridge.rb b/rb/lib/selenium/webdriver/remote/bridge.rb index 2c26285a780e0..b052652daf293 100644 --- a/rb/lib/selenium/webdriver/remote/bridge.rb +++ b/rb/lib/selenium/webdriver/remote/bridge.rb @@ -385,10 +385,16 @@ def add_cookie(cookie) end def delete_cookie(name) + if ( name.nil? || name.empty?) then + raise Error::ArgumentError, 'Cookie name cannot be null' + end execute :delete_cookie, name: name end def cookie(name) + if ( name.nil? || name.empty?) then + raise Error::ArgumentError, 'Cookie name cannot be null' + end execute :get_cookie, name: name end From 10cc4d3d305fb873bdaa4e0ed4b8a2665de46b59 Mon Sep 17 00:00:00 2001 From: Pallavi Date: Thu, 16 Jan 2025 21:51:39 +0530 Subject: [PATCH 2/9] modified error message for cookie --- rb/lib/selenium/webdriver/remote/bridge.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rb/lib/selenium/webdriver/remote/bridge.rb b/rb/lib/selenium/webdriver/remote/bridge.rb index b052652daf293..c5d0f8001b685 100644 --- a/rb/lib/selenium/webdriver/remote/bridge.rb +++ b/rb/lib/selenium/webdriver/remote/bridge.rb @@ -386,14 +386,14 @@ def add_cookie(cookie) def delete_cookie(name) if ( name.nil? || name.empty?) then - raise Error::ArgumentError, 'Cookie name cannot be null' + raise Error::ArgumentError, 'Cookie name cannot be null or empty' end execute :delete_cookie, name: name end def cookie(name) if ( name.nil? || name.empty?) then - raise Error::ArgumentError, 'Cookie name cannot be null' + raise Error::ArgumentError, 'Cookie name cannot be null or empty' end execute :get_cookie, name: name end From ed47fde23b5d85c0cfa8d293c9173a1ab2a28bd9 Mon Sep 17 00:00:00 2001 From: Pallavi Date: Mon, 20 Jan 2025 18:50:37 +0530 Subject: [PATCH 3/9] [rb]modified delete cookie code for ruby --- rb/lib/selenium/webdriver/remote/bridge.rb | 8 ++------ rb/spec/integration/selenium/webdriver/manager_spec.rb | 5 +++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/rb/lib/selenium/webdriver/remote/bridge.rb b/rb/lib/selenium/webdriver/remote/bridge.rb index c5d0f8001b685..851622954cf12 100644 --- a/rb/lib/selenium/webdriver/remote/bridge.rb +++ b/rb/lib/selenium/webdriver/remote/bridge.rb @@ -385,16 +385,12 @@ def add_cookie(cookie) end def delete_cookie(name) - if ( name.nil? || name.empty?) then - raise Error::ArgumentError, 'Cookie name cannot be null or empty' - end + raise Error::ArgumentError, 'Cookie name cannot be null or empty' if name.nil? || name.empty? execute :delete_cookie, name: name end def cookie(name) - if ( name.nil? || name.empty?) then - raise Error::ArgumentError, 'Cookie name cannot be null or empty' - end + raise Error::ArgumentError, 'Cookie name cannot be null or empty' if name.nil? || name.empty? execute :get_cookie, name: name end diff --git a/rb/spec/integration/selenium/webdriver/manager_spec.rb b/rb/spec/integration/selenium/webdriver/manager_spec.rb index d8d9d791ddc74..e9060248c8662 100644 --- a/rb/spec/integration/selenium/webdriver/manager_spec.rb +++ b/rb/spec/integration/selenium/webdriver/manager_spec.rb @@ -242,6 +242,11 @@ module WebDriver expect(driver.manage.all_cookies.find { |c| c[:name] == 'foo' }).to be_nil end + it 'throws error when cookie name is empty string' do + expect { driver.manage.delete_cookie('') } + .to raise_exception(Error::ArgumentError) + end + it 'deletes all' do driver.manage.add_cookie name: 'foo', value: 'bar' driver.manage.add_cookie name: 'bar', value: 'foo' From 2d6f8b07519d56d759f35732b90c4b1c3bafe352 Mon Sep 17 00:00:00 2001 From: Pallavi Date: Mon, 20 Jan 2025 19:50:18 +0530 Subject: [PATCH 4/9] [rb]modified cookie method --- rb/lib/selenium/webdriver/remote/bridge.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/rb/lib/selenium/webdriver/remote/bridge.rb b/rb/lib/selenium/webdriver/remote/bridge.rb index 851622954cf12..b12eb93a3366c 100644 --- a/rb/lib/selenium/webdriver/remote/bridge.rb +++ b/rb/lib/selenium/webdriver/remote/bridge.rb @@ -390,7 +390,6 @@ def delete_cookie(name) end def cookie(name) - raise Error::ArgumentError, 'Cookie name cannot be null or empty' if name.nil? || name.empty? execute :get_cookie, name: name end From 4aa7080d0e8ea6a03f0685cfedec2da44818d637 Mon Sep 17 00:00:00 2001 From: Pallavi Date: Mon, 20 Jan 2025 22:50:06 +0530 Subject: [PATCH 5/9] [rb] modified code for delete cookie --- rb/lib/selenium/webdriver/remote/bridge.rb | 2 +- rb/spec/integration/selenium/webdriver/manager_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rb/lib/selenium/webdriver/remote/bridge.rb b/rb/lib/selenium/webdriver/remote/bridge.rb index b12eb93a3366c..8b7cf16b47cc2 100644 --- a/rb/lib/selenium/webdriver/remote/bridge.rb +++ b/rb/lib/selenium/webdriver/remote/bridge.rb @@ -385,7 +385,7 @@ def add_cookie(cookie) end def delete_cookie(name) - raise Error::ArgumentError, 'Cookie name cannot be null or empty' if name.nil? || name.empty? + raise ArgumentError, 'Cookie name cannot be null or empty' if name.nil? || name.empty? execute :delete_cookie, name: name end diff --git a/rb/spec/integration/selenium/webdriver/manager_spec.rb b/rb/spec/integration/selenium/webdriver/manager_spec.rb index e9060248c8662..009856d24af69 100644 --- a/rb/spec/integration/selenium/webdriver/manager_spec.rb +++ b/rb/spec/integration/selenium/webdriver/manager_spec.rb @@ -244,7 +244,7 @@ module WebDriver it 'throws error when cookie name is empty string' do expect { driver.manage.delete_cookie('') } - .to raise_exception(Error::ArgumentError) + .to raise_exception(ArgumentError) end it 'deletes all' do From 150b92c4687760be7f6b6a28efaad192ddc0c2e3 Mon Sep 17 00:00:00 2001 From: Pallavi Date: Tue, 21 Jan 2025 00:05:24 +0530 Subject: [PATCH 6/9] [rb] modified as per suggestion by Augustin --- rb/lib/selenium/webdriver/remote/bridge.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rb/lib/selenium/webdriver/remote/bridge.rb b/rb/lib/selenium/webdriver/remote/bridge.rb index 8b7cf16b47cc2..3f1c8c13df9cf 100644 --- a/rb/lib/selenium/webdriver/remote/bridge.rb +++ b/rb/lib/selenium/webdriver/remote/bridge.rb @@ -385,7 +385,7 @@ def add_cookie(cookie) end def delete_cookie(name) - raise ArgumentError, 'Cookie name cannot be null or empty' if name.nil? || name.empty? + raise ArgumentError, 'Cookie name cannot be null or empty' unless name || !name.empty? execute :delete_cookie, name: name end From 81e72f9ee976bb1066db806065ecb67db44656fa Mon Sep 17 00:00:00 2001 From: Pallavi Date: Wed, 5 Mar 2025 17:12:40 +0530 Subject: [PATCH 7/9] modified code files --- rb/lib/selenium/webdriver/remote/bridge.rb | 3 ++- rb/spec/integration/selenium/webdriver/manager_spec.rb | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rb/lib/selenium/webdriver/remote/bridge.rb b/rb/lib/selenium/webdriver/remote/bridge.rb index 3f1c8c13df9cf..913b31357f0cc 100644 --- a/rb/lib/selenium/webdriver/remote/bridge.rb +++ b/rb/lib/selenium/webdriver/remote/bridge.rb @@ -385,9 +385,10 @@ def add_cookie(cookie) end def delete_cookie(name) - raise ArgumentError, 'Cookie name cannot be null or empty' unless name || !name.empty? + raise ArgumentError, 'Cookie name cannot be null or empty' if name.nil? || name.strip.empty? execute :delete_cookie, name: name end + def cookie(name) execute :get_cookie, name: name diff --git a/rb/spec/integration/selenium/webdriver/manager_spec.rb b/rb/spec/integration/selenium/webdriver/manager_spec.rb index 009856d24af69..ed57355c16d71 100644 --- a/rb/spec/integration/selenium/webdriver/manager_spec.rb +++ b/rb/spec/integration/selenium/webdriver/manager_spec.rb @@ -242,10 +242,11 @@ module WebDriver expect(driver.manage.all_cookies.find { |c| c[:name] == 'foo' }).to be_nil end - it 'throws error when cookie name is empty string' do + it 'throws an error when cookie name is an empty string' do expect { driver.manage.delete_cookie('') } - .to raise_exception(ArgumentError) + .to raise_error(ArgumentError, /Cookie name cannot be null or empty/) end + it 'deletes all' do driver.manage.add_cookie name: 'foo', value: 'bar' From 7299d444db12d8aceb038f250914cce6d1a8faac Mon Sep 17 00:00:00 2001 From: Pallavi Date: Wed, 5 Mar 2025 22:24:55 +0530 Subject: [PATCH 8/9] modified extra line --- rb/lib/selenium/webdriver/remote/bridge.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rb/lib/selenium/webdriver/remote/bridge.rb b/rb/lib/selenium/webdriver/remote/bridge.rb index a88c9001438b3..249c8dfb9d399 100644 --- a/rb/lib/selenium/webdriver/remote/bridge.rb +++ b/rb/lib/selenium/webdriver/remote/bridge.rb @@ -388,8 +388,7 @@ def delete_cookie(name) raise ArgumentError, 'Cookie name cannot be null or empty' if name.nil? || name.strip.empty? execute :delete_cookie, name: name end - - + def cookie(name) execute :get_cookie, name: name end From 436a1a460a4e670b5693344b591538411675b307 Mon Sep 17 00:00:00 2001 From: Pallavi Date: Wed, 5 Mar 2025 23:20:02 +0530 Subject: [PATCH 9/9] modified code --- rb/spec/integration/selenium/webdriver/manager_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/rb/spec/integration/selenium/webdriver/manager_spec.rb b/rb/spec/integration/selenium/webdriver/manager_spec.rb index ed57355c16d71..3785a4c95742b 100644 --- a/rb/spec/integration/selenium/webdriver/manager_spec.rb +++ b/rb/spec/integration/selenium/webdriver/manager_spec.rb @@ -247,7 +247,6 @@ module WebDriver .to raise_error(ArgumentError, /Cookie name cannot be null or empty/) end - it 'deletes all' do driver.manage.add_cookie name: 'foo', value: 'bar' driver.manage.add_cookie name: 'bar', value: 'foo'