capypage 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e17d0dec80b73008960e7db25880188e4d49ac34
-  data.tar.gz: 47d86693674305ec5141d0dbad476a4dda04d0a7
+  metadata.gz: 30a731012359de239cdb2f372f74ec752a45f69d
+  data.tar.gz: f76f9ceb5a7944cc056ba70bc7e760939c92ea7b
 SHA512:
-  metadata.gz: 98a96b1c0cb5b1fdb9f8668aad19641d22abe0201d59c90a80f05e1601de8ac245ed52d0c436ec8b7ddd4c139cb07dab815507f8442603c467d5ead739a50d3d
-  data.tar.gz: 2d3029f02d2e58f5ea513be0f9a06740fc4fcfb118e4c5f905890fc14f87f9d22797ae217ef67a6d1f4d6e372319347fbbf352782e66decf5a9fa812a2a891c3
+  metadata.gz: 0e9b7ff32666ee568658ac47ddfd75d4e252e8a79368626671d867f84fb0feca2915ddf0a7ca5cd6572f8d636f99a6575fa9e9588ae69f637090d556bf7f447e
+  data.tar.gz: a125616381900fc577e7d612a492790cc6a57a4b85e24efd442a9729d37bfec1d4557b2757e85b8a990ba1cb86c82ec686fa8f72e5357654b047c5eb20e21407

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-19mode
+  - 2.0.0

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+v 0.2.0
+
+* Not backward compatible - breaks the elements api in page to have better assertions on the elements level
+
+v 0.1.1
+
+* Added tests
+
+
+v 0.1.0
+
+Initial version extracted

data/README.md

@@ -2,6 +2,8 @@
 
 Page Object Model for Capybara
 
+[![Build Status](https://travis-ci.org/TWChennai/capypage.png?branch=master)](https://travis-ci.org/TWChennai/capypage)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/TODO.md

@@ -0,0 +1 @@
+* Get rid of prefix in favour of base_element

data/examples/simple/spec/spec_helper.rb

@@ -20,9 +20,9 @@ module DuckDuckGo
   end
 
   class ResultsPage < Capypage::Page
-    elements :results, '#links .results_links_deep' do |result|
+    elements :results, '#links', '.results_links_deep' do |result|
       result.element :link, '.links_main a'
       result.element :snippet, '.snippet'
     end
   end
-end
+end

data/lib/capypage/element.rb

@@ -6,11 +6,11 @@ module Capypage
     attr_accessor :selector, :prefix, :finder_options, :base_element
 
     def initialize(selector, prefix = nil, options = {}, &block)
-      options.reverse_merge! :match => :smart
+      options.reverse_merge! :match => :first
+      @finder_options = options.clone
       @selector = selector
       @prefix = prefix
-      @finder_options = options
-      @base_element = options.delete(:base_element) || Capybara.current_session
+      @base_element = finder_options[:base_element] || capybara_page
       block.call(self) if block.present?
     end
 
@@ -24,9 +24,11 @@ module Capypage
       define_singleton_method(name) { Elements.new(selector, prefix, options.reverse_merge!(:base_element => base), &block) }
     end
 
+    def present?
+      base_element.has_selector? element_selector, capybara_finder_options
+    end
+
     def visible?(options = {})
-      options.reverse_merge! finder_options
-      options.reverse_merge! :wait => 2
       return capybara_element(options).visible?
     rescue Capybara::ElementNotFound
       false
@@ -34,15 +36,25 @@ module Capypage
 
     protected
     def capybara_element(options = {})
-      base_element.find(element_selector, options.reverse_merge(finder_options))
+      base_element.find(element_selector, capybara_finder_options(options))
     end
 
     def element_selector
       [prefix, selector].compact.join(" ")
     end
 
+    def capybara_page
+      Capybara.current_session
+    end
+
+    def capybara_finder_options(options = {})
+      finder_options_without_base = finder_options.clone
+      finder_options_without_base.delete(:base_element)
+      options.reverse_merge finder_options_without_base
+    end
+
     def self.capybara_element_methods
-      Capybara::Node::Element.instance_methods - Object.methods
+      Capybara::Node::Element.instance_methods - Object.methods - [:visible?]
     end
 
     delegate *capybara_element_methods,

data/lib/capypage/elements.rb

@@ -6,34 +6,25 @@ module Capypage
     delegate :each, :size, :[],
              :to => :all
 
-    def initialize(selector, prefix = nil, options = {}, &block)
-      super(selector, prefix, options)
-      @child_dsl_block = block
-    end
-
-    def all(options = {})
-      base_element.has_selector? element_selector
-      base_element.all(element_selector, options.reverse_merge(finder_options))
-    end
+    def initialize(parent_selector, children_selector, prefix = nil, options = {}, &block)
+      parent_selector_options = options.merge :base_element => Element.new(parent_selector, prefix, options)
 
-    def find(text, options = {})
-      capybara_element options.merge(:text => text)
+      super(children_selector, prefix, parent_selector_options)
+      @child_dsl_block = block
     end
 
     def find_by_text(text, options = {})
       Element.new(selector, prefix, finder_options.merge(options).merge(:text => text), &child_dsl_block)
     end
 
-    def find_first(index = 1)
-      Elements.new("#{element_selector}:nth-child(-n+#{index})", prefix, finder_options)
+    def find_by_index(index)
+      Element.new("#{element_selector}:nth-child(#{index + 1})", prefix, finder_options, &child_dsl_block)
     end
 
-    def find_last(index = 1)
-      Elements.new("#{element_selector}:nth-last-child(-n+#{index})", prefix, finder_options)
+    private
+    def all(options = {})
+      base_element.all(element_selector, capybara_finder_options(options))
     end
 
-    def find_by_index(index)
-      Element.new("#{element_selector}:nth-child(#{index + 1})", prefix, finder_options, &child_dsl_block)
-    end
   end
-end
+end

data/lib/capypage/page.rb

@@ -22,8 +22,8 @@ module Capypage
         define_method(name) { Element.new(selector, prefix, options) }
       end
 
-      def elements(name, selector, options = {}, &block)
-        define_method(name) { Elements.new(selector, prefix, options, &block) }
+      def elements(name, parent_selector, children_selector, options = {}, &block)
+        define_method(name) { Elements.new(parent_selector, children_selector, prefix, options, &block) }
       end
 
       def section(name, section, selector, options = {})
@@ -37,4 +37,4 @@ module Capypage
       visit self.class.url
     end
   end
-end
+end

data/lib/capypage/version.rb

@@ -1,3 +1,3 @@
 module Capypage
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/element_spec.rb

@@ -11,4 +11,17 @@ describe Capypage::Element do
     expect(page.header).to_not have_text('Foo')
   end
 
-end
+  describe '#present?' do
+    it 'should be true for elements which are present' do
+      expect(page.header).to be_present
+      expect(page.missing_element).to_not be_present
+    end
+  end
+
+  describe '#visible?' do
+    it 'should be true for elements which are visible' do
+      expect(page.header).to be_visible
+      expect(page.invisble_element).to_not be_visible
+    end
+  end
+end

data/spec/elements_spec.rb

@@ -14,12 +14,25 @@ describe Capypage::Elements do
       element = elements.find_by_text('Title 1')
       expect(element.details.text).to eq('Details 1')
     end
+
+    it 'should return false when the child does not exists' do
+      element = elements.find_by_text 'Hello'
+      expect(element).to_not be_visible
+
+      expect(elements.find_by_text('Title 1')).to be_visible
+    end
+
+    it 'should look up the element in parent selector' do
+      element = elements.find_by_text 'Hello'
+      expect(element.base_element).to_not eq(Capybara.current_session)
+      expect(element.base_element.selector).to eq('ul.list')
+    end
   end
 
   describe 'delegation of capybara methods to the collection' do
-    xit 'should delegate has_text' do
+    it 'should delegate has_text' do
       expect(elements).to have_text('Title 1')
     end
   end
 
-end
+end

data/spec/sample_page.html

@@ -19,7 +19,7 @@
             <div class="details">Details 2</div>
         </li>
         <li>
-            <div class="title">Title 3</div>
+            <div class="title invisible" style="display: none">Title 3</div>
             <div class="details">Details 3</div>
         </li>
     </ul>

data/spec/spec_helper.rb

@@ -9,9 +9,11 @@ class SamplePage < Capypage::Page
   set_url '/'
 
   element :header, 'header'
-  elements :list, 'ul.list li' do |row|
+  element :missing_element, '.missing.element'
+  element :invisble_element, '.invisible'
+
+  elements :list, 'ul.list', 'li' do |row|
     row.element :title, '.title'
     row.element :details, '.details'
   end
-
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capypage
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Selvakumar Natesan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -91,10 +91,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.md
 - capypage.gemspec
 - examples/simple/Gemfile
 - examples/simple/README.md
@@ -131,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Page Object Model for Capybara