page_magic 2.0.3 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1a9811611ede317ffdd2a0bbc3a611f6eed20c8c23bd5bd7cbd355f0c66d660
-  data.tar.gz: 728d6cda028973338f615612b213f22c8954ea7e18322d6b4cdb078c7a9e8a9a
+  metadata.gz: b7c8b3d02f0d8ca42e539f1a7eb0166409efa99434f9bc1ebc814779bd639829
+  data.tar.gz: 5de8035527039cd66515208e996322c51f0646649a09f9a5a6fd3cf7c77e753b
 SHA512:
-  metadata.gz: 756ebdd5a0d88342fe934ef27abc8cf96bdb5ac2478dd89b421ff4d5343812d1aca9e5fde7b19bad993101f38c9ed44ecfa0a8d6d0eb8319ba87604d42da60f0
-  data.tar.gz: 44e72e003481db7ea23ec3716ce36f6fc8f767d805effef34c3f094c08f2ebbe3ace017bf080d56bb067653b46d4fa334d22bfdac4fe81ca98472f1a8fba9f61
+  metadata.gz: 7c120360eb3dd528b9f9292d07af056a7a2e27789d51474871820be2193a06360bd4b36e2e29ec654ef20b5b67f56ec7374f07803ad2a6ac0d581bbf9c1ea7c1
+  data.tar.gz: a8b5880ed40b04d1158895db11113e8554a014031dc2c52c06724b52a9c2fb7e9bc1e0c22b53cb9031466ff9d1d76de7700a01f8df3ea356f4e9babde2ed3a9d

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.0.9

data/lib/page_magic/drivers/selenium.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 PageMagic::Drivers::Selenium = PageMagic::Driver.new(:chrome, :firefox) do |app, options, browser|
-  require 'watir'
+  require 'capybara/selenium/driver'
   Capybara::Selenium::Driver.new(app, **options.dup.merge(browser: browser))
 end

data/lib/page_magic/session.rb

@@ -18,6 +18,8 @@ module PageMagic
     # Create a new session instance
     # @param [Object] capybara_session an instance of a capybara session
     # @param [String] base_url url to start the session at.
+    #
+
     def initialize(capybara_session, base_url = nil)
       @raw_session = capybara_session
       @base_url = base_url
@@ -44,6 +46,12 @@ module PageMagic
       @transitions = Transitions.new(transitions)
     end
 
+    def is_a?(klass)
+      return true if klass == Capybara::Session
+
+      super
+    end
+
     # proxies unknown method calls to the currently loaded page object
     # @return [Object] returned object from the page object method call
     def method_missing(name, *args, &block)
@@ -75,13 +83,14 @@ module PageMagic
     # @raise [InvalidURLException] if a page is supplied and there isn't a mapped path for it
     # @raise [InvalidURLException] if neither a page or url are supplied
     # @raise [InvalidURLException] if the mapped path for a page is a Regexp
-    def visit(page = nil, url: nil)
-      url ||= transitions.url_for(page, base_url: base_url)
+    # @return [PageMagic::Session] - returns self
+    def visit(page_or_url = nil, url: nil)
+      url ||= page_or_url.is_a?(String) ? page_or_url : transitions.url_for(page_or_url, base_url: base_url)
 
       raise InvalidURLException, URL_MISSING_MSG unless url
 
       raw_session.visit(url)
-      @current_page = initialize_page(page) if page
+      @current_page = initialize_page(page_or_url) unless page_or_url.is_a?(String)
       self
     end
 

metadata

@@ -1,125 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.9
 platform: ruby
 authors:
 - Leon Davis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-04 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug-ide
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -128,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 description: Framework for modeling and interacting with webpages which wraps capybara
 email: info@lvl-up.uk
 executables: []
@@ -143,21 +157,9 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".codeclimate.yml"
-- ".pullreview.yml"
-- ".rspec"
-- ".rubocop.yml"
-- ".simplecov"
 - ".yardopts"
-- ".zsh_config"
-- Dockerfile
-- Gemfile
-- Gemfile.lock
-- Makefile
 - README.md
-- Rakefile
 - VERSION
-- circle.yml
 - lib/active_support/core_ext/object/to_query.rb
 - lib/page_magic.rb
 - lib/page_magic/class_methods.rb
@@ -198,46 +200,9 @@ files:
 - lib/page_magic/wait_methods.rb
 - lib/page_magic/watcher.rb
 - lib/page_magic/watchers.rb
-- page_magic.gemspec
-- spec/lib/active_support/core_ext/object/to_query_test.rb
-- spec/page_magic/class_methods_spec.rb
-- spec/page_magic/comparator/fuzzy_spec.rb
-- spec/page_magic/comparator/literal_spec.rb
-- spec/page_magic/comparator/null_spec.rb
-- spec/page_magic/comparator/parameter_map_spec.rb
-- spec/page_magic/driver_spec.rb
-- spec/page_magic/drivers/poltergeist_spec.rb
-- spec/page_magic/drivers/rack_test_spec.rb
-- spec/page_magic/drivers/selenium_spec.rb
-- spec/page_magic/drivers_spec.rb
-- spec/page_magic/element/locators_spec.rb
-- spec/page_magic/element/not_found_spec.rb
-- spec/page_magic/element/query/multiple_results_spec.rb
-- spec/page_magic/element/query/single_result_spec.rb
-- spec/page_magic/element/query_spec.rb
-- spec/page_magic/element/selector_spec.rb
-- spec/page_magic/element_context_spec.rb
-- spec/page_magic/element_definition_builder_spec.rb
-- spec/page_magic/element_spec.rb
-- spec/page_magic/elements/config_spec.rb
-- spec/page_magic/elements_spec.rb
-- spec/page_magic/instance_methods_spec.rb
-- spec/page_magic/mapping_spec.rb
-- spec/page_magic/session_methods_spec.rb
-- spec/page_magic/session_spec.rb
-- spec/page_magic/transitions_spec.rb
-- spec/page_magic/utils/string_spec.rb
-- spec/page_magic/utils/url_spec.rb
-- spec/page_magic/wait_methods_spec.rb
-- spec/page_magic/watcher_spec.rb
-- spec/page_magic/watchers_spec.rb
-- spec/page_magic_spec.rb
-- spec/spec_helper.rb
-- spec/support/shared_contexts.rb
-- spec/support/shared_examples.rb
-homepage: https://github.com/ladtech/page_magic
+homepage: https://github.com/lvl-up/page_magic
 licenses:
-- ruby
+- Ruby
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -247,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.codeclimate.yml

@@ -1,4 +0,0 @@
-languages:
-   Ruby: true
-exclude_paths:
-- "spec/*"

data/.pullreview.yml

@@ -1,14 +0,0 @@
----
-languages:
- - ruby
-rules:
-  test_infection:
-    except:
-      - 'lib/page_magic/exceptions*'
-  missing_class_documentation:
-    except:
-      - 'lib/page_magic/element/query.rb'
-      - 'lib/page_magic/element/selector.rb'
-      - 'lib/page_magic/element/method_observer.rb'
-      - 'lib/page_magic/element.rb'
-      - 'lib/page_magic/session.rb'

data/.rspec

@@ -1 +0,0 @@
---require 'spec_helper'

data/.rubocop.yml

@@ -1,39 +0,0 @@
-require: rubocop-rspec
-
-Layout/LineLength:
-  Max: 120
-
-AllCops:
-  NewCops: enable
-  TargetRubyVersion: 2.7
-  Exclude:
-    - 'lib/active_support/**/*'
-    - 'spec/lib/active_support/**/*'
-    - 'pkg/**/*'
-    - 'vendor/**/*'
-    - 'coverage/**/*'
-    - '.idea/**/*'
-    - '*.gemspec'
-
-Metrics/ParameterLists:
-  CountKeywordArgs: false
-
-Metrics/MethodLength:
-  Max: 11
-
-#Style/MethodMissing:
-#  Enabled: false
-
-Metrics/BlockLength:
-  Enabled: true
-  Exclude:
-   - 'spec/**/*'
-
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    default: ()
-    '%i': '[]'
-    '%I': '[]'
-    '%r': '{}'
-    '%w': '[]'
-    '%W': '[]'

data/.simplecov

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require 'pullreview/coverage'
-
-SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, PullReview::Coverage::Formatter]
-
-SimpleCov.start do
-  add_filter '/spec/'
-  add_filter '/lib/active_support/core_ext/object/to_query.rb'
-end

data/.zsh_config

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-alias bundle="docker run -v $(pwd):/page_magic -t lvl-up/page-magic bundle"
-alias ruby="bundle exec ruby"
-alias rake="bundle exec rake"
-alias rubocop="bundle exec rubocop"
-alias gem="docker run -v $(pwd):/page_magic -t lvl-up/page-magic gem"

data/Dockerfile

@@ -1,11 +0,0 @@
-FROM ruby:2.7.2-alpine
-
-ENV APP_HOME /page_magic
-RUN mkdir $APP_HOME
-
-COPY . $APP_HOME
-WORKDIR $APP_HOME
-
-RUN apk --update --no-cache add build-base git
-RUN bundle install
-RUN rm -rf $APP_HOME

data/Gemfile

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gem 'activesupport'
-gem 'capybara', '>=3.0'
-
-group :test do
-  gem 'poltergeist'
-  gem 'rspec', require: 'rspec/core/rake_task'
-  gem 'simplecov', require: false
-  gem 'sinatra'
-  gem 'watir'
-end
-
-group :development do
-  gem 'github-markup'
-  gem 'jeweler'
-  gem 'redcarpet'
-  gem 'rubocop', require: 'rubocop/rake_task'
-  gem 'rubocop-rspec', require: false
-  gem 'ruby-debug-ide', require: false
-  gem 'yard', '~> 0.8'
-end