webaccount 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2ca939518ce138699dd157ad553ac523dfd860e6fa2677fa752e3efbdc5d0a1
-  data.tar.gz: 84018b777815434298373801a532f3c88d2e970ed4da0b762de13874e6fccda7
+  metadata.gz: 5f2306cf382f2ebbba8b93e9746e12c92d298ead4ba4f154fc71c223d844e2e0
+  data.tar.gz: c1b04987b7f1812c549fd8f0203457e515aab18e716f2885c29494c07688baf8
 SHA512:
-  metadata.gz: e0891afe41232589ba9d5bcadc419ae69b998ffc4f2c5d852c94884d7e02ee2757fd8253f51dddda253d98173f77964eacf865d2c57a8dee8cbbc59df1df8e35
-  data.tar.gz: a6578bc7d5ea85cd75415e41da0bb09c28e2fe40ea30bb34a1c94d5bf63d5bbee5e656a78514b862a87ef4bc8d1c8195ecd39294e3aba5abe138a0b5af3901c1
+  metadata.gz: 2f488ddda68db8c4807e5ad7ada9c8f85f48219a97e24be6f1ea6d1033395993a9bf6a74de615b539bdab6c749e7a11c3c4a1d04256dd94cfba743a2aadb0f8d
+  data.tar.gz: 86b9e301db625c6e236da7290d916a1fa629d3cdabf74cc4cb8f61f0b25d837a8b6bd5e5cec6b357b5f3baea0ff6d4d71739ddc7ac463089ee1a4a06df5e73bc

data/lib/WebAccount/VERSION.rb

@@ -1,5 +1,5 @@
 class WebAccount
 
-  VERSION = '0.2.5'
+  VERSION = '0.3.0'
 
 end

data/lib/WebAccount.rb

@@ -13,16 +13,16 @@ class WebAccount
   def initialize(
     username: nil, password: nil,
     login_page_url: nil,
-    login_page_username_field_id: nil, login_page_password_field_id: nil,
-    login_page_submit_button_id: nil,
-    logout_button_id: nil,
+    login_page_username_field_selector: nil, login_page_password_field_selector: nil,
+    login_page_submit_button_selector: nil,
+    logout_button_selector: nil,
     logged_out_xpath: nil
   )
     @username, @password = username, password
     @login_page_url = login_page_url
-    @login_page_username_field_id, @login_page_password_field_id = login_page_username_field_id, login_page_password_field_id
-    @login_page_submit_button_id = login_page_submit_button_id
-    @logout_button_id = logout_button_id
+    @login_page_username_field_selector, @login_page_password_field_selector = login_page_username_field_selector, login_page_password_field_selector
+    @login_page_submit_button_selector = login_page_submit_button_selector
+    @logout_button_selector = logout_button_selector
     @logged_out_xpath = logged_out_xpath
   end
 
@@ -38,13 +38,13 @@ class WebAccount
       login_page_submit_button.click
     end
     @logged_in = driver_wait.until do
-      driver.element_present?(:id, @logout_button_id)
+      driver.element_present?(@logout_button_selector.keys.first, @logout_button_selector.values.first)
     end
   end
   alias_method :logon, :login
 
   def logout
-    driver.find_element(:id, @logout_button_id).click
+    logout_button.click
     if logged_out?
       @logged_in = false
     end
@@ -98,8 +98,16 @@ class WebAccount
     username_field.send_keys(username)
   end
 
+  def default_username_field
+    {name: "username"}
+  end
+
   def username_field
-    driver.find_element(:id, @login_page_username_field_id)
+    if @login_page_username_field_selector
+      driver.find_element(@login_page_username_field_selector.keys.first, @login_page_username_field_selector.values.first)
+    else
+      driver.find_element(default_username_field.keys.first, default_username_field.values.first)
+    end
   end
 
   def enter_password(password = nil)
@@ -107,12 +115,41 @@ class WebAccount
     password_field.send_keys(password)
   end
 
+  def default_password_field
+    {name: "password"}
+  end
+
   def password_field
-    driver.find_element(:id, @login_page_password_field_id)
+    if @login_page_password_field_selector
+      driver.find_element(@login_page_password_field_selector.keys.first, @login_page_password_field_selector.values.first)
+    else
+      driver.find_element(default_password_field.keys.first, default_password_field.values.first)
+    end
+  end
+
+  def default_login_page_submit_button_selector
+    {xpath: '//input[@type="submit" and @value="Login"]'}
   end
 
   def login_page_submit_button
-    driver.find_element(:id, @login_page_submit_button_id)
+    if @login_page_submit_button_selector
+      driver.find_element(@login_page_submit_button_selector.keys.first, @login_page_submit_button_selector.values.first)
+    else
+      driver.find_element(default_login_page_submit_button_selector.keys.first, default_login_page_submit_button_selector.values.first)
+    end
   end
 
+  # logging out
+
+  def default_logout_button_selector
+    {xpath: '//input[@type="submit" and @value="Logout"]'}
+  end
+
+  def logout_button
+    if @logout_page_submit_button_selector
+      driver.find_element(@logout_button_selector.keys.first, @logout_button_selector.values.first)
+    else
+      driver.find_element(default_logout_button_selector.keys.first, default_logout_button_selector.values.first)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webaccount
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - thoran
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2024-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -24,8 +24,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Easily log into web accounts but just supplying a username and password,
-  the URL of the login page, and a few page ids to a subclass of WebAccount.
+description: Easily log into web accounts by supplying just a username and password,
+  the URL of the login page, and a few page ids to a sub-class of WebAccount.
 email: code@thoran.com
 executables: []
 extensions: []
@@ -47,7 +47,7 @@ homepage: http://github.com/thoran/WebAccount
 licenses:
 - Ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -62,9 +62,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.6
+signing_key:
 specification_version: 4
-summary: "# Description: An abstract superclass for navigating a web-based user account
-  via Selenium WebDriver."
+summary: An abstract super-class for navigating a web-based user account via Selenium
+  WebDriver.
 test_files: []