page_magic 1.2.6 → 2.0.0.alpha1

data/spec/page_magic/element/selector_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   class Element
     describe Selector do
@@ -33,7 +35,7 @@ module PageMagic
             described_class.new(supports_type: true)
           end
           it 'includes the element type in the result' do
-            expect(subject.build(:field, :locator)).to eq([:field, :locator])
+            expect(subject.build(:field, :locator)).to eq(%i[field locator])
           end
         end
 
@@ -54,7 +56,7 @@ module PageMagic
           end
 
           it 'is added to the result' do
-            expect(subject.build(:field, :locator)).to eq([:css, :locator])
+            expect(subject.build(:field, :locator)).to eq(%i[css locator])
           end
         end
       end
@@ -128,23 +130,28 @@ module PageMagic
       let(:capybara_session) { Capybara::Session.new(:rack_test, rack_app).tap { |s| s.visit('/elements') } }
 
       it 'finds elements by name' do
-        expect(capybara_session.all(*Query.find(:text_field).build(name: 'field_name')).size).to eq(1)
+        query = QueryBuilder.find(:text_field).build({ name: 'field_name' })
+        expect(query.execute(capybara_session)[:name]).to eq('field_name')
       end
 
       it 'finds elements by xpath' do
-        expect(capybara_session.all(*Query.find(:element).build(xpath: '//div/input')).size).to eq(1)
+        query = QueryBuilder.find(:element).build({ xpath: '//div/label/input' })
+        expect(query.execute(capybara_session)[:name]).to eq('field_name')
       end
 
       it 'finds elements by id' do
-        expect(capybara_session.all(*Query.find(:text_field).build(id: 'field_id')).size).to eq(1)
+        query = QueryBuilder.find(:text_field).build({ id: 'field_id' })
+        expect(query.execute(capybara_session)[:name]).to eq('field_name')
       end
 
       it 'finds elements by label' do
-        expect(capybara_session.all(*Query.find(:text_field).build(label: 'enter text')).size).to eq(1)
+        query = QueryBuilder.find(:text_field).build({ label: 'enter text' })
+        expect(query.execute(capybara_session)[:name]).to eq('field_name')
       end
 
       it 'finds elements by text' do
-        expect(capybara_session.all(*Query.find(:link).build(text: 'a link')).size).to eq(1)
+        query = QueryBuilder.find(:link).build({ text: 'a link' })
+        expect(query.execute(capybara_session).text).to eq('a link')
       end
     end
   end

data/spec/page_magic/element_context_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   describe ElementContext do
     include_context :webapp_fixture
@@ -31,7 +33,7 @@ module PageMagic
         end
 
         it 'passes arguments through to the element definition' do
-          elements_page.link :pass_through, css: 'a' do |args|
+          elements_page.links :pass_through, css: 'a' do |args|
             args[:passed_through] = true
           end
           args = {}
@@ -51,19 +53,12 @@ module PageMagic
 
         context 'more than one match found in the browser' do
           it 'returns an array of element definitions' do
-            elements_page.link :links, css: 'a'
+            elements_page.links :links, css: 'a'
             links = described_class.new(page).links
-            expect(links.find_all { |e| e.class == Element }.size).to eq(2)
+            expect(links.find_all { |e| e.kind_of?(Element) }.size).to eq(2)
             expect(links.collect(&:text)).to eq(['a link', 'link in a form'])
           end
         end
-        context 'no results found' do
-          it 'raises an error' do
-            elements_page.link :missing, css: 'wrong'
-            expected_message = described_class::ELEMENT_NOT_FOUND_MSG % 'css "wrong"'
-            expect { described_class.new(page).missing }.to raise_exception(ElementMissingException, expected_message)
-          end
-        end
       end
 
       context 'method found on page_element' do

data/spec/page_magic/element_definition_builder_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   describe ElementDefinitionBuilder do
     describe '#initialize' do
@@ -69,7 +71,7 @@ module PageMagic
                                       element: Object.new,
                                       options: options)
 
-        expect(builder.build_query).to eq([:xpath, '//xpath', options])
+        expect(builder.build_query).to eq(Element::Query.new([:xpath, '//xpath', options]))
       end
     end
   end

data/spec/page_magic/elements_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable Metrics/ModuleLength
 module PageMagic
   describe Elements do
@@ -17,12 +19,19 @@ module PageMagic
 
     let(:child_selector) { { id: 'child' } }
 
+    context 'element types' do
+      it 'provides all of the type provided by capybara' do
+        capybara_elements = Capybara::Selector.all.except(*%i[element datalist_input datalist_option id xpath css]).keys
+        expect(described_class::TYPES).to include(*capybara_elements)
+      end
+    end
+
     describe '#element' do
       it 'sets the selector and type' do
         expected_definition = ElementDefinitionBuilder.new(definition_class: Element,
                                                            type: :text_field,
                                                            selector: child_selector,
-                                                           options: {})
+                                                           options: { multiple_results: false })
         subject.text_field :alias, child_selector
         expect(instance.element_by_name(:alias)).to eq(expected_definition)
       end
@@ -113,8 +122,7 @@ module PageMagic
             subject.class_eval do
               link(:hello, text: 'world')
 
-              def hello
-              end
+              def hello; end
             end
           end.to raise_error(InvalidMethodNameException)
         end
@@ -122,8 +130,7 @@ module PageMagic
         it 'should not allow element names that match method names' do
           expect do
             subject.class_eval do
-              def hello
-              end
+              def hello; end
 
               link(:hello, text: 'world')
             end
@@ -150,6 +157,13 @@ module PageMagic
       end
     end
 
+    describe '#elements' do
+      it 'is an alias of #element allowing page_magic to find multiple results' do
+        expected = described_class.public_instance_method(:element)
+        expect(described_class.public_instance_method(:elements)).to eq(expected)
+      end
+    end
+
     describe '#element_definitions' do
       it 'should return your a copy of the core definition' do
         subject.text_field :alias, child_selector

data/spec/page_magic/instance_methods_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   describe InstanceMethods do
     include_context :webapp_fixture

data/spec/page_magic/matcher_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable Metrics/ModuleLength
 module PageMagic
   describe Matcher do
@@ -161,7 +163,7 @@ module PageMagic
 
         context 'parameter requirement is a regexp' do
           subject do
-            described_class.new(parameters: { foo: /b[a]r/ })
+            described_class.new(parameters: { foo: /bar/ })
           end
 
           it 'returns true for a match on the regexp' do

data/spec/page_magic/session_methods_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   describe SessionMethods do
     include_context :webapp_fixture

data/spec/page_magic/session_spec.rb

@@ -124,7 +124,7 @@ module PageMagic
       context 'more than one match on path' do
         it 'orders the results by specificity ' do
           subject.define_page_mappings %r{/page} => :mapped_page_using_regex, '/page' => :mapped_page_using_string
-          expected_result = [:mapped_page_using_string, :mapped_page_using_regex]
+          expected_result = %i[mapped_page_using_string mapped_page_using_regex]
           expect(subject.instance_eval { matches('/page') }).to eq(expected_result)
         end
       end
@@ -155,15 +155,14 @@ module PageMagic
 
       it 'checks the current page' do
         page.class_eval do
-          def my_method
-          end
+          def my_method; end
         end
         expect(subject.respond_to?(:my_method)).to eq(true)
       end
     end
 
     describe '#url' do
-      let!(:base_url) { 'http://example.com' }
+      let!(:base_url) { "http://example.com" }
       let!(:path) { 'home' }
       let!(:expected_url) { "#{base_url}/#{path}" }
 

data/spec/page_magic/utils/string_spec.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'page_magic/utils/string'
+module PageMagic
+  module Utils
+    describe String do
+      describe '.classify' do
+        context 'parameter is symbol' do
+          it 'returns a string' do
+            expect(described_class.classify(:Symbol)).to eq('Symbol')
+          end
+        end
+
+        context 'parameter is string' do
+          it 'returns a string' do
+            expect(described_class.classify(:String)).to eq('String')
+          end
+        end
+
+        context 'single word' do
+          context 'first letter is lower case' do
+            it 'converts the first letter to uppercase' do
+              expect(described_class.classify(:symbol)).to eq('Symbol')
+            end
+          end
+        end
+
+        context 'snakecase' do
+          it 'removes underscores and capitalises each word' do
+            expect(described_class.classify(:snake_case)).to eq('SnakeCase')
+          end
+        end
+      end
+    end
+  end
+end

data/spec/page_magic/wait_methods_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   describe WaitMethods do
     subject do
@@ -9,20 +11,20 @@ module PageMagic
     let(:default_options) { { timeout_after: 0.1, retry_every: 0.05 } }
 
     it 'waits until the prescribed thing has happened' do
-      expect { subject.wait_until(default_options) { true } }.to_not raise_exception
+      expect { subject.wait_until(**default_options) { true } }.to_not raise_exception
     end
 
     it 'should keep trying for a specified period' do
       start_time = Time.now
 
-      expect { subject.wait_until(default_options) { false } }.to raise_exception TimeoutException
+      expect { subject.wait_until(**default_options) { false } }.to raise_exception TimeoutException
 
       expect(Time.now - default_options[:timeout_after]).to be > start_time
     end
 
     context 'timeout_after specified' do
       it 'throws an exception if when the prescribed action does not happen in time' do
-        expect { subject.wait_until(default_options) { false } }.to raise_error TimeoutException
+        expect { subject.wait_until(**default_options) { false } }.to raise_error TimeoutException
       end
     end
 

data/spec/page_magic/watchers_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   describe Watchers do
     let(:element) { OpenStruct.new(text: :current_value) }

data/spec/page_magic_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'page_magic'
 
 describe PageMagic do
@@ -56,6 +58,8 @@ describe PageMagic do
   end
 
   describe '.session' do
+    include_context :rack_application
+
     let(:url) { 'http://url.com/' }
     let(:application) { rack_application.new }
 
@@ -75,12 +79,6 @@ describe PageMagic do
       end
     end
 
-    include_context :rack_application
-    it 'sets the base url for the session' do
-      session = described_class.session(application: application, url: url)
-      expect(session.current_url).to eq(url)
-    end
-
     context 'specifying a rack application' do
       it 'configures capybara to run against the app' do
         session = described_class.session(application: application, url: url)
@@ -99,7 +97,7 @@ describe PageMagic do
 
     context 'driver for browser not found' do
       it 'raises an error' do
-        expected_exception = described_class::UnspportedBrowserException
+        expected_exception = described_class::UnsupportedBrowserException
         expect { described_class.session(browser: :invalid, url: url) }.to raise_exception expected_exception
       end
     end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+require 'bundler'
 Bundler.require
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/lib")
 require 'support/shared_contexts'
@@ -6,3 +8,4 @@ require 'support/shared_examples'
 require 'simplecov' if ENV['coverage']
 
 require 'page_magic'
+Capybara.server = :webrick

data/spec/support/shared_contexts.rb

@@ -1,3 +1,5 @@
-Dir["#{__dir__}/shared_contexts/*.rb"].each do |file|
+# frozen_string_literal: true
+
+Dir["#{__dir__}/shared_contexts/*.rb"].sort.each do |file|
   require file
 end

data/spec/support/shared_contexts/files_context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_context :files do
   require 'tmpdir'
 

data/spec/support/shared_contexts/nested_elements_html_context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_context :nested_elements_html do
   require 'sinatra/base'
 

data/spec/support/shared_contexts/rack_application_context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_context :rack_application do
   let(:rack_application) do
     Class.new do

data/spec/support/shared_contexts/webapp_fixture_context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_context :webapp_fixture do
   require 'sinatra/base'
 
@@ -21,7 +23,7 @@ shared_context :webapp_fixture do
             <label>enter text
               <input id='field_id' name='field_name' class='input_class' type='text' value='filled in'/>
             </label>
-            <input id='form_button' type='submit' value='a button'/>
+            <button id='form_button' type='submit' value='a button'/>
           </form>
 
         ELEMENTS

data/spec/support/shared_examples.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   shared_examples 'session accessor' do
     it 'includes session methods' do

data/spec/watcher_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   describe Watcher do
     describe '#initialize' do
@@ -37,6 +39,7 @@ module PageMagic
       context 'block supplied to constructor' do
         def method_on_self(value = nil)
           return @value unless value
+
           @value = value
         end
 

metadata

@@ -1,115 +1,129 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 2.0.0.alpha1
 platform: ruby
 authors:
 - Leon Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: github-markup
+  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: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     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'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: ruby-debug-ide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.8'
 description: Framework for modeling and interacting with webpages which wraps capybara
-email: info@lad-tech.com
+email: info@lvl-up.uk
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -121,12 +135,16 @@ files:
 - ".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
 - lib/page_magic/driver.rb
@@ -137,6 +155,7 @@ files:
 - lib/page_magic/element.rb
 - lib/page_magic/element/locators.rb
 - lib/page_magic/element/query.rb
+- lib/page_magic/element/query_builder.rb
 - lib/page_magic/element/selector.rb
 - lib/page_magic/element/selector_methods.rb
 - lib/page_magic/element_context.rb
@@ -147,11 +166,13 @@ files:
 - lib/page_magic/matcher.rb
 - lib/page_magic/session.rb
 - lib/page_magic/session_methods.rb
+- lib/page_magic/utils/string.rb
 - lib/page_magic/wait_methods.rb
 - lib/page_magic/watcher.rb
 - lib/page_magic/watchers.rb
 - page_magic.gemspec
 - spec/element_spec.rb
+- spec/lib/active_support/core_ext/object/to_query_test.rb
 - spec/page_magic/class_methods_spec.rb
 - spec/page_magic/driver_spec.rb
 - spec/page_magic/drivers/poltergeist_spec.rb
@@ -159,6 +180,7 @@ files:
 - spec/page_magic/drivers/selenium_spec.rb
 - spec/page_magic/drivers_spec.rb
 - spec/page_magic/element/locators_spec.rb
+- spec/page_magic/element/query_builder_spec.rb
 - spec/page_magic/element/query_spec.rb
 - spec/page_magic/element/selector_spec.rb
 - spec/page_magic/element_context_spec.rb
@@ -168,6 +190,7 @@ files:
 - spec/page_magic/matcher_spec.rb
 - spec/page_magic/session_methods_spec.rb
 - spec/page_magic/session_spec.rb
+- spec/page_magic/utils/string_spec.rb
 - spec/page_magic/wait_methods_spec.rb
 - spec/page_magic/watchers_spec.rb
 - spec/page_magic_spec.rb
@@ -183,7 +206,7 @@ homepage: https://github.com/ladtech/page_magic
 licenses:
 - ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,13 +217,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Framework for modeling and interacting with webpages
 test_files: []