Fix error initialisation (#67)

* fix Error::WebDriverError initliase error

* update changelog

Author: KazuCocoa

CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 - [iOS] Add `start_performance_record` and `get_performance_record`
 
 ### Bug fixes
+- Fix _create_session attempt to throw non-existent error type Appium::Core::Error::WebDriverError_ [#66](https://github.com/appium/ruby_lib_core/issues/66)
 
 ### Deprecations
 

lib/appium_lib_core/common/base/bridge.rb

@@ -22,7 +22,7 @@ def self.handshake(**opts)
 
           if desired_capabilities.is_a?(Symbol)
             unless ::Selenium::WebDriver::Remote::Capabilities.respond_to?(desired_capabilities)
-              raise Error::WebDriverError, "invalid desired capability: #{desired_capabilities.inspect}"
+              raise ::Selenium::WebDriver::Error::WebDriverError, "invalid desired capability: #{desired_capabilities.inspect}"
             end
             desired_capabilities = Remote::Capabilities.__send__(desired_capabilities)
           end
@@ -105,7 +105,7 @@ def create_session(desired_capabilities)
           end
 
           unless @session_id
-            raise Error::WebDriverError, 'no sessionId in returned payload'
+            raise ::Selenium::WebDriver::Error::WebDriverError, 'no sessionId in returned payload'
           end
 
           json_create(oss_status, value)

lib/appium_lib_core/driver.rb

@@ -190,14 +190,14 @@ def start_driver(server_url: nil,
       # Ignore setting default wait if the target driver has no implementation
       def set_implicit_wait_by_default(wait)
         @driver.manage.timeouts.implicit_wait = wait
-      rescue Selenium::WebDriver::Error::UnknownError => e
+      rescue ::Selenium::WebDriver::Error::UnknownError => e
         unless e.message.include?('The operation requested is not yet implemented')
           raise e.message, ::Appium::Core::Error::ServerError
         end
 
         Appium::Logger.debug(e.message)
         {}
-      rescue Selenium::WebDriver::Error::WebDriverError => e
+      rescue ::Selenium::WebDriver::Error::WebDriverError => e
         # FIXME: Temporary rescue until Appium support W3C's implicit wait
         # https://github.com/jlipps/simple-wd-spec#set-timeouts
         unless e.message.include?('Parameters were incorrect. We wanted {"required":["type","ms"]} and you sent ["implicit"]')

test/functional/android/android/device_test.rb

@@ -60,7 +60,7 @@ def test_background_reset
         assert_equal 'App', e.name
 
         @@driver.background_app(-1)
-        error = assert_raises Selenium::WebDriver::Error::WebDriverError do
+        error = assert_raises ::Selenium::WebDriver::Error::WebDriverError do
           @@driver.find_element :accessibility_id, 'App'
         end
         assert 'An element could not be located on the page using the given search parameters.', error.message
@@ -277,7 +277,7 @@ def test_open_notifications
 
         # Sometimes, we should wait animation
         @@core.wait(timeout: 5) do
-          error = assert_raises Selenium::WebDriver::Error::WebDriverError do
+          error = assert_raises ::Selenium::WebDriver::Error::WebDriverError do
             @@driver.find_element :accessibility_id, ':-|'
           end
           assert 'An element could not be located on the page using the given search parameters.', error.message

test/functional/ios/ios/device_test.rb

@@ -57,7 +57,7 @@ def test_background_reset
         assert_equal 'TextView', e.name
 
         @@driver.background_app(-1)
-        error = assert_raises Selenium::WebDriver::Error::WebDriverError do
+        error = assert_raises ::Selenium::WebDriver::Error::WebDriverError do
           @@driver.find_element :accessibility_id, 'TextView'
         end
         assert 'An element could not be located on the page using the given search parameters.', error.message
@@ -213,7 +213,7 @@ def test_hidekeyboard
           sleep 1 # wait animation
         end
 
-        m = assert_raises Selenium::WebDriver::Error::WebDriverError do
+        m = assert_raises ::Selenium::WebDriver::Error::WebDriverError do
           @@driver.find_element(:class, 'XCUIElementTypeKeyboard')
         end
         assert 'An element could not be located on the page using the given search parameters.', m.message

test/unit/android/webdriver_test.rb

@@ -12,6 +12,40 @@ def setup
         @driver ||= android_mock_create_session
       end
 
+      def test_no_session_id
+        response = {
+          status: 0, # To make bridge.dialect == :oss
+          value: {
+            capabilities: {
+              desired: {
+                platformName: 'Android',
+                automationName: 'uiautomator2',
+                platformVersion: '7.1.1',
+                deviceName: 'Android Emulator',
+                app: '/test/apps/ApiDemos-debug.apk',
+                newCommandTimeout: 240,
+                unicodeKeyboard: true,
+                resetKeyboard: true
+              },
+              platformName: 'Android',
+              automationName: 'uiautomator2',
+              platformVersion: '7.1.1',
+              deviceName: 'emulator-5554',
+              app: '/test/apps/ApiDemos-debug.apk'
+            }
+          }
+        }.to_json
+
+        stub_request(:post, 'http://127.0.0.1:4723/wd/hub/session')
+          .to_return(headers: HEADER, status: 200, body: response)
+
+        error = assert_raises ::Selenium::WebDriver::Error::WebDriverError do
+          @core.start_driver
+        end
+
+        assert_equal 'no sessionId in returned payload', error.message
+      end
+
       def test_remote_status
         stub_request(:get, 'http://127.0.0.1:4723/wd/hub/status')
           .to_return(headers: HEADER, status: 200, body: { value: 'xxxx' }.to_json)

test/unit/android/webdriver_w3c_test.rb

@@ -12,6 +12,34 @@ def setup
         @driver ||= android_mock_create_session_w3c
       end
 
+      def test_no_session_id
+        response = {
+          value: {
+            capabilities: {
+              platformName: :android,
+              automationName: 'uiautomator2',
+              app: 'test/functional/app/api.apk',
+              platformVersion: '7.1.1',
+              deviceName: 'Android Emulator',
+              appPackage: 'io.appium.android.apis',
+              appActivity: 'io.appium.android.apis.ApiDemos',
+              someCapability: 'some_capability',
+              unicodeKeyboard: true,
+              resetKeyboard: true
+            }
+          }
+        }.to_json
+
+        stub_request(:post, 'http://127.0.0.1:4723/wd/hub/session')
+          .to_return(headers: HEADER, status: 200, body: response)
+
+        error = assert_raises ::Selenium::WebDriver::Error::WebDriverError do
+          @core.start_driver
+        end
+
+        assert_equal 'no sessionId in returned payload', error.message
+      end
+
       def test_remote_status
         stub_request(:get, 'http://127.0.0.1:4723/wd/hub/status')
           .to_return(headers: HEADER, status: 200, body: { value: 'xxxx' }.to_json)