page_magic 0.11.0.alpha7 → 0.11.0.alpha8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aea679cbb291387aa604e03d5d0e3cb5adf28141
-  data.tar.gz: 52fde80f96207b3632b89fbd98d4cb16e083ffb8
+  metadata.gz: 3b3b5bae4a08579ffe198524fb160791d40c75d0
+  data.tar.gz: cfbcade44965019d6614dbd8a397cb717d0d608b
 SHA512:
-  metadata.gz: e67be00ed38102cf53891a69fb815042020cbe51e6f8a5d82c83ca0a0041ddbe688b69061174a2ab00946410648a13202320abcc48a3311019b2019b6871c48d
-  data.tar.gz: 13b0e6b736234d5f48d6669b3b39a75f6c32e869c3710ec4efdffe0dde5a543bb117bdb5384b56542961416a06d8aeb977239d5bc45d7ce0cebda3f9212c927e
+  metadata.gz: 9802999ea9cafdbe9c1104784047ae65734cfc5bef00f6da87b0da30c4b143c3add0e5cd0be4fd1e1655ce39290ce3884d53816e61c2c3f979fdad9a47312bc2
+  data.tar.gz: 1382773ba5e71d48604da93565ff477eaf3bdc901a1735ad6eca8859bb968bcc9b67704c81c53a7398cc28794200786c63714222bfd9282ec6603131e934d9d6

data/README.md

@@ -1,5 +1,4 @@
-[![Build Status](https://travis-ci.org/Ladtech/page_magic.png)](https://travis-ci.org/Ladtech/page_magic)
-#PageMagic 
+#PageMagic
 PageMagic is an API for testing web applications. 
 
 It has a simple but powerful DSL which makes modelling and interacting with your pages easy.

data/VERSION

@@ -1 +1 @@
-0.11.0.alpha7
+0.11.0.alpha8

data/lib/page_magic/element_context.rb

@@ -28,19 +28,15 @@ module PageMagic
         element_locator = element_locator_factory.call(@page_element, *args)
       end
 
-      result = element_locator.browser_element
-
-      return element_locator if element_locator.section?
-
       [:set, :select_option, :unselect_option, :click].each do |action_method|
-        apply_hooks(page_element: result,
+        apply_hooks(page_element: element_locator.browser_element,
                     capybara_method: action_method,
                     before_hook: element_locator.before,
                     after_hook: element_locator.after,
         )
       end
 
-      result
+      element_locator.section? ? element_locator : element_locator.browser_element
     end
 
     def apply_hooks(options)

data/lib/page_magic/session.rb

@@ -1,34 +1,53 @@
 require 'wait'
 module PageMagic
   class Session
-    attr_accessor :current_page, :raw_session
+    attr_accessor :current_page, :raw_session, :transitions
 
     def initialize browser
       @raw_session = browser
     end
 
-    def define_transitions transitions
+    def define_page_mappings transitions
       @transitions = transitions
     end
 
-    def visit page
-      @raw_session.visit page.url
+    def current_page
+      if transitions
+        mapping = find_mapped_page(current_path)
+        @current_page = mapping.new(self) if mapping
+      end
+      @current_page
+    end
+
+    def find_mapped_page path
+      mapping = transitions.keys.find do |key|
+        string_matches?(path, key)
+      end
+      transitions[mapping]
+    end
+
+    def string_matches?(string, matcher)
+      if matcher.is_a?(Regexp)
+        string =~ matcher
+      elsif matcher.is_a?(String)
+        string == matcher
+      else
+        false
+      end
+    end
+
+    def visit(page, url: nil)
+      raw_session.visit url || page.url
       @current_page = page.new self
       self
     end
 
     def current_path
-      @raw_session.current_path
+      raw_session.current_path
     end
 
     def current_url
-      @raw_session.current_url
-    end
-
-    def move_to page_class
-      page_class = eval(page_class) if page_class.is_a?(String)
-      @current_page = page_class.new self
-      wait_until { raw_session.current_url == page_class.url }
+      raw_session.current_url
     end
 
     def wait_until &block
@@ -37,7 +56,7 @@ module PageMagic
     end
 
     def method_missing name, *args, &block
-      @current_page.send(name, *args, &block)
+      current_page.send(name, *args, &block)
     end
 
   end

data/spec/page_magic/element_context_spec.rb

@@ -87,23 +87,40 @@ describe PageMagic::ElementContext do
 
   describe 'hooks' do
 
+    subject(:page) do
+      elements_page.new.tap do|p|
+        p.visit
+      end
+    end
 
-    #it 'only applies them if browser element supports event' do
-    #  page = elements_page.new
-    #end
-
-    it 'should execute a before and after action that gives access to the browser' do
-
-      page = elements_page.new
-      page.visit
-
-      selector = {text: 'a link'}
+    before do
       browser = page.browser
       browser.should_receive(:call_in_before_hook)
       browser.should_receive(:call_in_after_before_hook)
+    end
 
 
-      elements_page.link(:create, selector) do
+    context 'section' do
+      it 'applies the hooks' do
+
+        elements_page.section(:form, id: 'form') do
+          link :form_link, id: 'form_link'
+
+          before do |page_browser|
+            page_browser.call_in_before_hook
+          end
+
+          after do |page_browser|
+            page_browser.call_in_after_before_hook
+          end
+        end
+
+        described_class.new(page, page.browser, self).form.click
+      end
+    end
+
+    it 'should execute a before and after action that gives access to the browser' do
+      elements_page.link(:create, text: 'a link') do
         before do |page_browser|
           page_browser.call_in_before_hook
         end

data/spec/page_magic/session_spec.rb

@@ -3,7 +3,7 @@ describe PageMagic::Session do
   let(:page) do
     Class.new do
       include PageMagic
-      url :url
+      url '/page1'
 
       def my_method
         :called
@@ -20,48 +20,82 @@ describe PageMagic::Session do
 
   let(:browser) { double('browser', current_url: 'url') }
 
-  it 'should visit the given url' do
-    browser.should_receive(:visit).with(page.url)
-    session = PageMagic::Session.new(browser).visit(page)
-    session.current_page.should be_a(page)
-  end
+  describe '#current_page' do
+    subject do
+      PageMagic::Session.new(browser).tap do |session|
+        session.define_page_mappings '/another_page1' => another_page_class
+      end
+    end
+    context 'page url has not changed' do
+      it 'returns the original page' do
+        browser.should_receive(:visit).with(page.url)
+        allow(browser).to receive(:current_path).and_return('/page1')
+        subject.visit(page)
+        expect(subject.current_page).to be_an_instance_of(page)
+      end
+    end
 
-  it 'should return the current url' do
-    session = PageMagic::Session.new(browser)
-    session.current_url.should == 'url'
+    context 'page url has changed' do
+      it 'returns the mapped page object' do
+        browser.should_receive(:visit).with(page.url)
+        subject.visit(page)
+        allow(browser).to receive(:current_path).and_return('/another_page1')
+        expect(subject.current_page).to be_an_instance_of(another_page_class)
+      end
+    end
   end
 
-  context 'method_missing' do
-    it 'should delegate to current page' do
-      browser.stub(:visit)
-      session = PageMagic::Session.new(browser).visit(page)
-      session.my_method.should be(:called)
+  describe '#find_mapped_page' do
+    subject do
+      described_class.new(nil).tap do |session|
+        session.define_page_mappings '/page' => :mapped_page_using_string, /page\d/ => :mapped_page_using_regex
+      end
+    end
+
+    context 'mapping is string' do
+      it 'returns the page class' do
+        expect(subject.find_mapped_page('/page')).to be(:mapped_page_using_string)
+      end
+    end
+    context 'mapping is regex' do
+      it 'returns the page class' do
+        expect(subject.find_mapped_page('/page2')).to be(:mapped_page_using_regex)
+      end
     end
-  end
 
-  context 'move_to moves the session object to another page' do
-    it 'can take a class' do
-      page_magic_session = PageMagic::Session.new(double(:browser, current_url: '/another_page1'))
-      page_magic_session.move_to(another_page_class)
-      page_magic_session.current_page.should be_a(another_page_class)
+    context 'mapping is not found' do
+      it 'returns nil' do
+        expect(subject.find_mapped_page('/fake_page')).to be(nil)
+      end
     end
+  end
 
-    it 'can take the name of the class as a string' do
-      class ThePage
-        include PageMagic
-        url '/the_page'
+  describe '#visit' do
+    context 'url supplied' do
+      it 'uses this url instead of the one defined on the page class' do
+        expect(browser).to receive(:visit).with(:custom_url)
+        session = PageMagic::Session.new(browser).visit(page, url: :custom_url)
+        session.current_page.should be_a(page)
       end
+    end
 
-      page_magic_session = PageMagic::Session.new(double(:browser, current_url: '/the_page'))
-      page_magic_session.move_to("ThePage")
-      page_magic_session.current_page.should be_a(ThePage)
+    it 'visits the url on defined on the page class' do
+      browser.should_receive(:visit).with(page.url)
+      session = PageMagic::Session.new(browser).visit(page)
+      session.current_page.should be_a(page)
     end
+  end
 
-    it 'should wait until the browser url has changed' do
-      mock_browser = double(:browser, current_url: 'a')
-      page_magic_session = PageMagic::Session.new(mock_browser)
+  it 'should return the current url' do
+    session = PageMagic::Session.new(browser)
+    session.current_url.should == 'url'
+  end
 
-      expect { page_magic_session.move_to(another_page_class) }.to raise_error(Wait::ResultInvalid)
+  context 'method_missing' do
+    it 'should delegate to current page' do
+      browser.stub(:visit)
+      session = PageMagic::Session.new(browser).visit(page)
+      session.my_method.should be(:called)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 0.11.0.alpha7
+  version: 0.11.0.alpha8
 platform: ruby
 authors:
 - Leon Davis
@@ -104,7 +104,6 @@ files:
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile

data/.travis.yml

@@ -1,4 +0,0 @@
-rvm:
-  - '2.1'
-  - '2.2
-