webdriver 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3f6a656b20690e475178f82ce162fdf50d3832d6b61c7c96010baf4a89eb920
-  data.tar.gz: d415081d653084bc5a2e6a1c3da9123dfc7eb4d078bc16aff8c504cd633fa4ed
+  metadata.gz: 80278385c728ce0a053617fee79944dffaee727c10f5ae1df7b86ac0379c8391
+  data.tar.gz: 84e2890d9bbb1f942656b4678caf41fbaaf85ef45ad0ca11973b1b22ca7f74c7
 SHA512:
-  metadata.gz: 151900f17d60f7a545455bdcfb757425a2eaee7f0eb96edd6b620334101123494c4f3d8eed7cc9439322073f8b20fe8f8653040c1010546050198af4eb38abc8
-  data.tar.gz: 9587106a957c5039aaed13cbeaa7c21a8e75558aa4fb997302a91d686b4e5703d480a7d3bb23d07232187b6152380b646a39f7f60b83b1b2723954090c4477d6
+  metadata.gz: 0e0ee164e79d453e9d636b642bdc957536d214e22dd9e2fa0b6d9958989439a25ecda6733c2c226159ede39b57a13ed59ab4aac6b9e144d9b00d89fbac4d1ca0
+  data.tar.gz: 740e79f4d76ef3183208a20a5802ac67e7f0eee6c1e460611b553892aff38aebdb3f196f9528279a55ccaffbf2b96c811df545b02fa0b7413f5a8dfa3f72691d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    webdriver (0.5.0)
+    webdriver (0.6.0)
 
 GEM
   remote: https://rubygems.org/

data/examples/find_and_click.rb

@@ -0,0 +1,13 @@
+require_relative "../lib/webdriver"
+
+s = (Webdriver::Client.new "http://localhost:9515/").session!
+
+s.url! "https://example.com"
+
+3.times do |i|
+  all_a_els = s.elements "css selector", "a"
+  all_a_els&.first.click!
+  sleep 1
+end
+
+s.delete!

data/lib/webdriver/connection.rb

@@ -1,21 +1,23 @@
 module Webdriver
   class Connection
-    def initialize(endpoint)
+    def initialize endpoint
       uri = URI(endpoint)
       @http = Net::HTTP.new uri.hostname, uri.port
     end
 
-    def get(path, headers={})
+    def get path, headers={}
       call :get, path, headers
     end
-    def post(path, headers={}, body=nil)
+
+    def post path, headers={}, body=nil
       call :post, path, headers, body
     end
-    def post(path, headers={}, body=nil)
+
+    def post path, headers={}, body=nil
       call :post, path, headers, body
     end
 
-    def call(method, path, headers={}, body={})
+    def call method, path, headers={}, body={}
       path = "/#{path}"
       body_json = body.to_json if body
       Webdriver.debug [method, path, headers, body_json]
@@ -45,12 +47,15 @@ module Webdriver
         else # everything else works like this
           value
         end
+      when 1..nil
+        error_message = value.dig("message")
+        pp [:err, value.dig("message")]
+        raise error_message
       else
         if method == :get && path == "/status"
           value
         else
-          pp [status, response_body]
-          raise "err"
+          raise value.dig("message")
         end
       end
     end

data/lib/webdriver/cookie.rb

@@ -0,0 +1,50 @@
+module Webdriver
+  class Cookie
+    attr_reader :name
+
+    def initialize(name, connection)
+      @name = name
+      @session_connection = connection
+      @connection = Webdriver::PrefixConnection.new "cookie/#{@name}", connection
+    end
+
+    def delete!
+      @connection.delete
+      self
+    end
+
+    def domain
+      __refresh["domain"]
+    end
+
+    def expiry
+      __refresh["expiry"]
+    end
+
+    def http_only
+      __refresh["httpOnly"]
+    end
+
+    def path
+      __refresh["path"]
+    end
+
+    def same_site
+      __refresh["sameSite"]
+    end
+
+    def secure
+      __refresh["secure"]
+    end
+
+    def value
+      __refresh["value"]
+    end
+
+    private
+
+    def __refresh
+      @connection.get
+    end
+  end
+end

data/lib/webdriver/element.rb

@@ -9,6 +9,36 @@ module Webdriver
       @connection = Webdriver::PrefixConnection.new "element/#{@id}", connection
     end
 
+    def screenshot
+      @connection.get "screenshot"
+    end
+
+    # checkbox
+    def selected?
+      @connection.get "selected"
+    end
+
+    # form control enabled
+    def enabled?
+      @connection.get "enabled"
+    end
+
+    def clear!
+      @connection.post "clear"
+      click!
+    end
+
+    def value! value
+      value_string = value.to_s
+      if value_string == ""
+        clear!
+      else
+        @connection.post "value", {}, {
+          value: [value_string]
+        }
+      end
+    end
+
     def text
       @connection.get "text"
     end
@@ -21,6 +51,10 @@ module Webdriver
       @connection.get "name"
     end
 
+    def css name
+      @connection.get File.join("css", name)
+    end
+
     def property name
       @connection.get File.join("property", name)
     end
@@ -33,7 +67,7 @@ module Webdriver
       @connection.post "click"
     end
 
-    def element(using, value)
+    def element using, value
       el = @connection.post "element", {}, {
         using: using,
         value: value
@@ -41,7 +75,7 @@ module Webdriver
       Webdriver::Element.new el["ELEMENT"], @session_connection
     end
 
-    def elements(using, value)
+    def elements using, value
       resp = @connection.post "elements", {}, {
         using: using,
         value: value

data/lib/webdriver/prefix_connection.rb

@@ -5,17 +5,19 @@ module Webdriver
       @connection = connection
     end
 
-    def get(path, headers={})
+    def get path=nil, headers={}
       call :get, path, headers
     end
-    def post(path=nil, headers={}, body=nil)
+
+    def post path=nil, headers={}, body=nil
       call :post, path, headers, body
     end
-    def delete(path=nil, headers={}, body=nil)
+
+    def delete path=nil, headers={}, body=nil
       call :delete, path, headers, body
     end
 
-    def call(method, path=nil, headers={}, body=nil)
+    def call method, path=nil, headers={}, body=nil
       prefixed_path = if path
         "#{@prefix}/#{path}"
       else

data/lib/webdriver/session.rb

@@ -9,6 +9,7 @@ module Webdriver
 
     def delete!
       @connection.delete
+      session
     end
 
     def windows
@@ -16,10 +17,50 @@ module Webdriver
       value.map { |id| Webdriver::Window.new id, @connection }
     end
 
+    # not implemented in chromedriver
+    # def source
+    #   @connection.post "source"
+    # end
+
+    def dismiss_alert!
+      @connection.post "alert/dismiss"
+      self
+    end
+
+    def accept_alert!
+      @connection.post "alert/accept"
+      self
+    end
+
+    def alert_text
+      @connection.get "alert/text"
+    end
+
+    # TODO: Does not work with prompt
+    # def alert_text! text
+    #   @connection.post "alert/text", {}, {
+    #     text: text
+    #   }
+    # end
+
+    # iframe id
+    def frame! name
+      @connection.post "frame", {}, {
+        id: name
+      }
+      self
+    end
+
+    def parent_frame!
+      @connection.post "frame/parent", {}, {}
+      self
+    end
+
     def url! url
       @connection.post "url", {}, {
         url: url
       }
+      self
     end
 
     def url
@@ -28,32 +69,102 @@ module Webdriver
 
     def back!
       @connection.post "back"
+      self
     end
 
     def forward!
       @connection.post "forward"
+      self
     end
 
     def refresh!
       @connection.post "refresh"
+      self
     end
 
     def title
       @connection.get "title"
     end
 
+    def cookies
+      resp = @connection.get "cookie"
+
+      resp.map { |el| Webdriver::Cookie.new el["name"], @connection }
+    end
+
+    def cookies_delete!
+      @connection.delete "cookie"
+      self
+    end
+
+    def cookie name
+      resp = @connection.get File.join("cookie",name)
+      Webdriver::Element.new resp["name"], @connection
+    end
+
+    #TODO: ??
+    # def cookie_add(name, value)
+    #   @connection.post "cookie", {}, {
+    #     name: name,
+    #     args: {
+    #       cookie: value,
+    #     },
+    #   }
+    # end
+
+    # TODO: hangs
+    # def execute_async! script, args=[]
+    #   @connection.post "execute/async", {}, {
+    #     script: script,
+    #     args: args
+    #   }
+    # end
+
     def execute_sync! script, args=[]
-      @connection.post "execute/sync", {}, {
+      resp = @connection.post "execute/sync", {}, {
         script: script,
         args: args
       }
+
+      value = if resp.is_a?(Hash) && resp["ELEMENT"]
+        begin
+          el = Webdriver::Element.new resp["ELEMENT"], @connection
+          el.tag
+          el
+        rescue
+          resp
+        end
+      elsif resp.is_a?(Array)
+        begin
+          resp.map do |r|
+            el = Webdriver::Element.new r["ELEMENT"], @connection
+            el.tag
+            el
+          end
+        rescue
+          resp
+        end
+      else
+        resp
+      end
     end
 
+    # not implemented in chromedriver
+    # def print!
+    #   @connection.post "print"
+    # end
+
     def screenshot
       @connection.get "screenshot"
     end
 
-    def element(using, value)
+    # when moving with tab, or clicked
+    def active_element
+      el = @connection.get "element/active"
+      Webdriver::Element.new el["ELEMENT"], @connection
+    end
+
+    def element using, value
       el = @connection.post "element", {}, {
         using: using,
         value: value
@@ -61,7 +172,7 @@ module Webdriver
       Webdriver::Element.new el["ELEMENT"], @connection
     end
 
-    def elements(using, value)
+    def elements using, value
       resp = @connection.post "elements", {}, {
         using: using,
         value: value

data/lib/webdriver/version.rb

@@ -1,3 +1,3 @@
 module Webdriver
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/webdriver/window.rb

@@ -23,7 +23,7 @@ module Webdriver
         x: x,
         y: y
       })
-      rect
+      self
     end
 
     def rect
@@ -32,10 +32,12 @@ module Webdriver
 
     def fullscreen!
       @connection.post "fullscreen"
+      self
     end
 
     def close!
       @connection.delete
+      self
     end
   end
 end

data/lib/webdriver.rb

@@ -18,3 +18,4 @@ require_relative "webdriver/window"
 require_relative "webdriver/session"
 require_relative "webdriver/element"
 require_relative "webdriver/client"
+require_relative "webdriver/cookie"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdriver
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,10 +150,12 @@ files:
 - e2e/window.rb
 - e2e/windows.rb
 - examples/args.rb
+- examples/find_and_click.rb
 - examples/text_and_html.rb
 - lib/webdriver.rb
 - lib/webdriver/client.rb
 - lib/webdriver/connection.rb
+- lib/webdriver/cookie.rb
 - lib/webdriver/element.rb
 - lib/webdriver/prefix_connection.rb
 - lib/webdriver/session.rb