page_magic 1.2.9 → 2.0.0.alpha1

data/lib/page_magic/session_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 module PageMagic
   # module SessionMethods - contains methods for interacting with the {Session}

data/lib/page_magic/utils/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   module Utils
     # module String - contains methods for manipulating strings

data/lib/page_magic/wait_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   # module WaitMethods - contains methods for waiting
   module WaitMethods
@@ -10,6 +12,7 @@ module PageMagic
       start_time = Time.now
       until Time.now > start_time + timeout_after
         return true if yield == true
+
         sleep retry_every
       end
       raise TimeoutException, 'Action took to long'

data/lib/page_magic/watcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   # class WatchedElementDefinition - Contains the specification the for checking if an subject has changed
   class Watcher

data/lib/page_magic/watchers.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'page_magic/watcher'
 
 module PageMagic
   # module Watchers - contains methods for adding watchers and checking them
   module Watchers
-    ELEMENT_MISSING_MSG = 'Unable to defined watcher: Element or method with the name %s can not be found'.freeze
+    ELEMENT_MISSING_MSG = 'Unable to defined watcher: Element or method with the name %s can not be found'
 
     # @param [Symbol] name - the name of the watcher
     # @return [Boolean] true if a change is detected
@@ -24,6 +26,7 @@ module PageMagic
     # end
     def watch(name, method = nil, &block)
       raise ElementMissingException, (ELEMENT_MISSING_MSG % name) unless block || respond_to?(name)
+
       watched_element = block ? Watcher.new(name, &block) : Watcher.new(name, method)
       watchers.delete_if { |w| w.name == name }
       watchers << watched_element.check(self)

data/spec/element_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable Metrics/ModuleLength
 module PageMagic
   describe Element do

data/spec/page_magic/class_methods_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   describe ClassMethods do
     subject do

data/spec/page_magic/driver_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'page_magic/driver'
 
 module PageMagic

data/spec/page_magic/drivers/poltergeist_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'page_magic/drivers/poltergeist'
 module PageMagic
   describe Drivers::Poltergeist do

data/spec/page_magic/drivers/rack_test_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'page_magic/drivers/rack_test'
 module PageMagic
   class Drivers

data/spec/page_magic/drivers/selenium_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'page_magic/drivers/selenium'
 module PageMagic
   describe Drivers::Selenium do

data/spec/page_magic/drivers_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'page_magic/drivers'
 module PageMagic
   describe Drivers do

data/spec/page_magic/element/locators_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   class Element
     describe Locators do

data/spec/page_magic/element/query_builder_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   class Element
     describe QueryBuilder do
@@ -75,7 +77,7 @@ module PageMagic
         end
 
         it 'the same as all form field types' do
-          expect(described_class).to eq(CHECKBOX).and eq(SELECT_LIST).and eq(RADIO).and eq(TEXTAREA)
+          expect(described_class).to eq(CHECKBOX).and eq(SELECT_LIST).and eq(RADIO).and eq(TEXTAREA).and eq(FILE_FIELD).and eq(FILLABLE_FIELD).and eq(RADIO_BUTTON)
         end
       end
     end
@@ -85,22 +87,22 @@ module PageMagic
       let(:capybara_session) { Capybara::Session.new(:rack_test, rack_app).tap { |s| s.visit('/elements') } }
 
       it 'finds fields' do
-        query = QueryBuilder.find(:text_field).build(name: 'field_name')
+        query = QueryBuilder.find(:text_field).build({ name: 'field_name' })
         expect(query.execute(capybara_session).tag_name).to eq('input')
       end
 
       it 'finds buttons' do
-        query = QueryBuilder.find(:button).build(text: 'a button')
+        query = QueryBuilder.find(:button).build({ text: 'a button' })
         expect(query.execute(capybara_session).tag_name).to eq('button')
       end
 
       it 'finds links' do
-        query = QueryBuilder.find(:link).build(text: 'a link')
+        query = QueryBuilder.find(:link).build({ text: 'a link' })
         expect(query.execute(capybara_session).tag_name).to eq('a')
       end
 
       it 'finds elements' do
-        query = QueryBuilder.find(:element).build(name: 'field_name')
+        query = QueryBuilder.find(:element).build({ name: 'field_name' })
         expect(query.execute(capybara_session).tag_name).to eq('input')
       end
     end

data/spec/page_magic/element/query_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   class Element
     describe Query do
@@ -14,18 +16,18 @@ module PageMagic
       describe '#execute' do
         context 'no results found' do
           subject do
-            QueryBuilder.find(:link).build(css: 'wrong')
+            QueryBuilder.find(:link).build({ css: 'wrong' })
           end
 
           it 'raises an error' do
-            expected_message = 'Unable to find visible css "wrong"'
+            expected_message = 'Unable to find css "wrong"'
             expect { subject.execute(page.browser) }.to raise_exception(ElementMissingException, expected_message)
           end
         end
 
         context 'to many results returned' do
           subject do
-            QueryBuilder.find(:link).build(css: 'a')
+            QueryBuilder.find(:link).build({ css: 'a' })
           end
 
           it 'raises an error' do
@@ -47,7 +49,7 @@ module PageMagic
         end
 
         it 'returns the result of the capybara query' do
-          query = QueryBuilder.find(:link).build(id: 'form_link')
+          query = QueryBuilder.find(:link).build({ id: 'form_link' })
           result = query.execute(page.browser)
           expect(result.text).to eq('link in a form')
         end

data/spec/page_magic/element/selector_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageMagic
   class Element
     describe Selector do
@@ -128,27 +130,27 @@ module PageMagic
       let(:capybara_session) { Capybara::Session.new(:rack_test, rack_app).tap { |s| s.visit('/elements') } }
 
       it 'finds elements by name' do
-        query = QueryBuilder.find(:text_field).build(name: 'field_name')
+        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
-        query = QueryBuilder.find(:element).build(xpath: '//div/label/input')
+        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
-        query = QueryBuilder.find(:text_field).build(id: 'field_id')
+        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
-        query = QueryBuilder.find(:text_field).build(label: 'enter text')
+        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
-        query = QueryBuilder.find(:link).build(text: 'a link')
+        query = QueryBuilder.find(:link).build({ text: 'a link' })
         expect(query.execute(capybara_session).text).to eq('a link')
       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
@@ -53,7 +55,7 @@ module PageMagic
           it 'returns an array of element definitions' do
             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

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

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,6 +19,13 @@ 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,

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

@@ -162,7 +162,7 @@ module PageMagic
     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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'page_magic/utils/string'
 module PageMagic
   module Utils

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'