page_magic 1.0.0.alpha20 → 1.0.0.alpha21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49ba851eb365dd26d8f8a4f31d5d9a00edd453a5
-  data.tar.gz: dddb7d4942c3a1957e2ace92af5cfe9420cb4b56
+  metadata.gz: 115f37789b407f0f922654cec028ab74268132c4
+  data.tar.gz: ad52bf172b7e0ebd649f738c86e418c47c57a70f
 SHA512:
-  metadata.gz: 3034f818fb008d3c2efb696be112f0c1fc5f69c33618ad148ae98a2ab5fc728d5c30ea40835428dcf3164b37cc9e23de548c556b5f484e16b003faf1c828c547
-  data.tar.gz: 91090c400e40cbbee6cb9e6c3b0c2b1bc28c810da8c8fd492d80c867dbf15bb4fedd29326f9b917ceb2c497aef0bb78eeb37108ff04d30f58b92a27dc9501a57
+  metadata.gz: 1a3d128c9dbf70e10c7aae8ddef2c48603714b625634639b8b559af1870655a114c9f706447add67e906ed4cd087e905dc827492798b8b71166455e1cade255b
+  data.tar.gz: 6428d9dc270bc4768556e102a68bf0014817c05e3c947e467fc7cad3868b3cf7ad0007cf34a16cab24fc9cb8d23502192509103d6ca9799efe4f8c514c352337

data/README.md

@@ -7,7 +7,7 @@ It has a simple but powerful DSL which makes modelling and interacting with your
 Wouldn't it be great if there was a framework that could:
 - [Model your pages](#modelling-pages)
 - [Fluently define interaction hooks / waiters on page elements](#interaction-hooks)
-- [Provide urls to pages to avoid awkward page object switching](#page-mapping)
+- [Map paths to pages so that the correct page object is loaded as you navigate](#page-mapping)
 - [Be super dynamic](#dynamic-selectors)
 
 Well PageMagic might just be the answer!

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha20
+1.0.0.alpha21

data/circle.yml

@@ -1,3 +1,6 @@
+machine:
+  ruby:
+    version: '2.1'
 test:
   override:
     - bundle exec rake

data/lib/page_magic/class_methods.rb

@@ -16,5 +16,19 @@ module PageMagic
       return @on_load || DEFAULT_ON_LOAD unless block
       @on_load = block
     end
+
+    # Visit this page based on the class level registered url
+    # @param [Object] application rack application (optional)
+    # @param [Symbol] browser name of browser
+    # @param [Hash] options browser driver specific options
+    # @return [Session] active session configured to be using an instance of the page object modeled by this class
+    def visit(application: nil, browser: :rack_test, options: {})
+      session_options = { browser: browser, options: options, url: url }
+      session_options[:application] = application if application
+
+      PageMagic.session(session_options).tap do |session|
+        session.visit(self, url: url)
+      end
+    end
   end
 end

data/lib/page_magic/instance_methods.rb

@@ -24,12 +24,6 @@ module PageMagic
       text.downcase.include?(string.downcase)
     end
 
-    # Visit this page based on the class level registered url
-    def visit
-      browser.visit self.class.url
-      execute_on_load
-    end
-
     # @return the page text
     def text
       browser.text

data/lib/page_magic.rb

@@ -16,6 +16,12 @@ module PageMagic
       @drivers ||= Drivers.new.tap(&:load)
     end
 
+    # Visit this page based on the class level registered url
+    # @param [Object] application rack application (optional)
+    # @param [Symbol] browser name of browser
+    # @param [String] url url to start the session on
+    # @param [Hash] options browser driver specific options
+    # @return [Session] configured sessoin
     def session(application: nil, browser: :rack_test, url:, options: {})
       driver = drivers.find(browser)
       fail UnspportedBrowserException unless driver

data/spec/element_spec.rb

@@ -10,9 +10,9 @@ module PageMagic
       end
     end
 
-    let(:page) do
-      page_class.new.tap(&:visit)
-    end
+    let(:session) { page_class.visit(application: rack_app) }
+
+    let(:page) { session.current_page }
 
     describe 'inheriting' do
       it 'lets you create custom elements' do
@@ -62,14 +62,11 @@ module PageMagic
     describe '#browser_element' do
       let!(:browser) { double('browser') }
 
-      it 'calls the on_load hook' do
-      end
-
       context 'options supplied to selector' do
         it 'passes them on to the cappybara finder method' do
           options = { count: 1 }
           xpath_selector = '//div/input'
-          expect(Capybara.current_session).to receive(:find).with(:xpath, xpath_selector, options)
+          expect(page.session.raw_session).to receive(:find).with(:xpath, xpath_selector, options)
           described_class.new(:my_input,
                               page,
                               type: :text_field,

data/spec/page_magic/class_methods_spec.rb

@@ -1,7 +1,10 @@
 module PageMagic
   describe ClassMethods do
     subject do
-      Object.new.tap { |o| o.extend(described_class) }
+      Class.new.tap do |clazz|
+        clazz.extend(described_class)
+        clazz.include(InstanceMethods)
+      end
     end
     describe '#url' do
       it 'get/sets a value' do
@@ -25,5 +28,20 @@ module PageMagic
         end
       end
     end
+
+    describe '#visit' do
+      include_context :webapp_fixture
+      it 'passes all options to create an active session on the registered url' do
+        subject.url '/page1'
+        expect(PageMagic).to receive(:session).with(application: rack_app,
+                                                    options: {},
+                                                    browser: :rack_test,
+                                                    url: subject.url).and_call_original
+
+        session = subject.visit(application: rack_app, options: {}, browser: :rack_test)
+
+        expect(session.title).to eq('page1')
+      end
+    end
   end
 end

data/spec/page_magic/element_context_spec.rb

@@ -16,7 +16,7 @@ module PageMagic
 
     describe '#method_missing' do
       let(:page) do
-        elements_page.new.tap(&:visit)
+        elements_page.visit(application: rack_app).current_page
       end
 
       context 'neither a method or page element are defined' do

data/spec/page_magic/instance_methods_spec.rb

@@ -11,12 +11,12 @@ module PageMagic
     end
 
     subject do
-      page_class.new.tap(&:visit)
+      page_class.visit(application: rack_app)
     end
 
     describe 'execute_on_load' do
       it 'runs the on_load_hook in the context of self' do
-        instance = subject
+        instance = subject.current_page
         page_class.on_load do
           extend RSpec::Matchers
           expect(self).to be(instance)
@@ -26,7 +26,7 @@ module PageMagic
       end
 
       it 'returns self' do
-        expect(subject.execute_on_load).to be(subject)
+        expect(subject.execute_on_load).to be(subject.current_page)
       end
     end
 
@@ -44,16 +44,11 @@ module PageMagic
       it 'goes to the class define url' do
         expect(subject.session.current_path).to eq('/page1')
       end
-
-      it 'runs the on load handler' do
-        expect(subject).to receive(:execute_on_load).and_call_original
-        subject.visit
-      end
     end
 
     describe 'session' do
       it 'gives access to the page magic object wrapping the user session' do
-        expect(subject.session.raw_session).to be(Capybara.current_session)
+        expect(subject.session.raw_session).to be_a(Capybara::Session)
       end
     end
 

data/spec/support/shared_contexts/webapp_context.rb

@@ -1,17 +1,18 @@
 shared_context :webapp_fixture do
   require 'sinatra/base'
 
-  rack_app = Class.new(Sinatra::Base) do
-    get '/page1' do
-      "<html><head><title>page1</title></head><body><a href='/page2'>next page</a></body></html>"
-    end
-
-    get '/page2' do
-      'page 2 content'
-    end
-
-    get '/elements' do
-      <<-ELEMENTS
+  let(:rack_app) do
+    Class.new(Sinatra::Base) do
+      get '/page1' do
+        "<html><head><title>page1</title></head><body><a href='/page2'>next page</a></body></html>"
+      end
+
+      get '/page2' do
+        'page 2 content'
+      end
+
+      get '/elements' do
+        <<-ELEMENTS
           <a href='#'>a link</a>
 
 
@@ -23,7 +24,8 @@ shared_context :webapp_fixture do
             <input id='form_button' type='submit' value='a button'/>
           </form>
 
-      ELEMENTS
+        ELEMENTS
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha20
+  version: 1.0.0.alpha21
 platform: ruby
 authors:
 - Leon Davis
@@ -133,8 +133,6 @@ files:
 - ".pullreview.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-gemset"
-- ".ruby-version"
 - ".simplecov"
 - ".yardopts"
 - Gemfile
@@ -160,7 +158,6 @@ files:
 - lib/page_magic/exceptions.rb
 - lib/page_magic/instance_methods.rb
 - lib/page_magic/session.rb
-- page_magic.gemspec
 - spec/element_spec.rb
 - spec/member_methods_spec.rb
 - spec/page_magic/class_methods_spec.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-page_magic

data/.ruby-version

@@ -1 +0,0 @@
-2.1

data/page_magic.gemspec

@@ -1,76 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = 'page_magic'
-  s.version = '0.11.0.alpha3'
-
-  s.required_rubygems_version = Gem::Requirement.new('> 1.3.1') if s.respond_to? :required_rubygems_version=
-  s.authors = ['Leon Davis']
-  s.date = '2014-04-05'
-  s.description = 'Framework for modeling and interacting with webpages which wraps capybara'
-  s.email = 'info@lad-tech.com'
-  s.extra_rdoc_files = [
-    'README.md'
-  ]
-  s.files = [
-    '.rspec',
-    '.ruby-gemset',
-    '.ruby-version',
-    '.travis.yml',
-    'Gemfile',
-    'Gemfile.lock',
-    'README.md',
-    'Rakefile',
-    'VERSION',
-    'lib/ext/string.rb',
-    'lib/page_magic.rb',
-    'lib/page_magic/ajax_support.rb',
-    'lib/page_magic/browser.rb',
-    'lib/page_magic/element.rb',
-    'lib/page_magic/element_context.rb',
-    'lib/page_magic/elements.rb',
-    'lib/page_magic/exceptions.rb',
-    'lib/page_magic/page_magic.rb',
-    'lib/page_magic/session.rb',
-    'page_magic.gemspec',
-    'spec/browser_spec.rb',
-    'spec/element_context_spec.rb',
-    'spec/element_spec.rb',
-    'spec/helpers/capybara.rb',
-    'spec/member_methods_spec.rb',
-    'spec/page_magic/elements_spec.rb',
-    'spec/page_magic/usage/defining_page_elements_spec.rb',
-    'spec/page_magic/usage/defining_pages_spec.rb',
-    'spec/page_magic/usage/include_page_magic_spec.rb',
-    'spec/page_magic/usage/interacting_with_pages_spec.rb',
-    'spec/page_magic/usage/starting_a_session_spec.rb',
-    'spec/session_spec.rb',
-    'spec/spec_helper.rb'
-  ]
-  s.homepage = 'https://github.com/ladtech/page_magic'
-  s.licenses = ['ruby']
-  s.require_paths = ['lib']
-  s.rubygems_version = '2.0.3'
-  s.summary = 'Framework for modeling and interacting with webpages'
-
-  if s.respond_to? :specification_version
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
-      s.add_runtime_dependency('capybara', ['>= 0'])
-      s.add_runtime_dependency('wait', ['>= 0'])
-      s.add_development_dependency('jeweler', ['>= 0'])
-    else
-      s.add_dependency('capybara', ['>= 0'])
-      s.add_dependency('wait', ['>= 0'])
-      s.add_dependency('jeweler', ['>= 0'])
-    end
-  else
-    s.add_dependency('capybara', ['>= 0'])
-    s.add_dependency('wait', ['>= 0'])
-    s.add_dependency('jeweler', ['>= 0'])
-  end
-end