capybara-pageobject 0.1.0 → 0.1.1

data/capybara-pageobject.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "capybara"
 
   s.add_runtime_dependency("capybara", [">= 1.0.0"])
+  s.add_runtime_dependency("rspec-expectations")
 end

data/lib/capybara-pageobject.rb

@@ -21,15 +21,21 @@ module Capybara
       end
 
       def current_website
-        @website ||= Capybara::PageObject::Website.new(Capybara.current_session, self, @page_file)
+        @website ||= instantiate_website Capybara::PageObject::Website
       end
 
       def website_class= klass
         raise "website class #{klass} should extend Capybara::PageObject::Website" unless klass.ancestors.include?(Capybara::PageObject::Website)
-        @website = klass.new(Capybara.current_session, self, @page_file)
+        @website = instantiate_website klass
       end
     end
 
+    private
+
+    def self.instantiate_website klass
+      klass.new(Capybara.current_session, @page_file)
+    end
+
     module IncludedMethods
       def website
         Capybara::PageObject.current_website

data/lib/capybara-pageobject/page.rb

@@ -2,6 +2,7 @@ module Capybara
   module PageObject
     class Page
       include CapybaraHelper
+      include RSpec::Matchers
 
       attr_accessor :context
 
@@ -36,7 +37,7 @@ module Capybara
       end
 
       def method_missing method, *args
-        page.respond_to?(method) ? page.send(method, *args) : context.send(method, *args)
+        page.respond_to?(method) ? page.send(method, *args) : super
       end
 
       protected

data/lib/capybara-pageobject/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module PageObject
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/capybara-pageobject/website.rb

@@ -2,9 +2,8 @@ module Capybara
   module PageObject
     class Website
 
-      def initialize page, context, page_file
+      def initialize page, page_file
         @page = page
-        @context = context
 
         raise "Please specify page file path" unless page_file.present?
         @pages_data = YAML.load_file(page_file)

data/spec/page_spec.rb

@@ -100,5 +100,10 @@ describe "Page" do
     end
   end
 
+  describe "include rspec matchers" do
+    it { page_object({}).be_visible }
+    it { page_object({}).be_present }
+  end
+
   it { page_object({"name" => "page"}).to_s.should == "'page: page'" }
 end

data/spec/website_spec.rb

@@ -5,7 +5,7 @@ def with_yaml page_data
 end
 
 describe "Website" do
-  let(:website) { Capybara::PageObject::Website.new(capybara_page, self, 'pages/pages.yml') }
+  let(:website) { Capybara::PageObject::Website.new(capybara_page, 'pages/pages.yml') }
   subject { website }
 
   describe "create getters" do
@@ -22,7 +22,7 @@ describe "Website" do
   end
 
   it "should raise error if page_file is not specified" do
-    expect { Capybara::PageObject::Website.new(capybara_page, self, '') }.to raise_error(Exception, "Please specify page file path")
+    expect { Capybara::PageObject::Website.new(capybara_page, '') }.to raise_error(Exception, "Please specify page file path")
   end
 
   describe "custom page class" do
@@ -34,16 +34,17 @@ describe "Website" do
 
     it "should fail if custom class does not extend Page class" do
       with_yaml("home_page" => {"class" => "Object"})
-      expect { Capybara::PageObject::Website.new(capybara_page, self, 'pages/pages.yml') }.to raise_error(Exception, "Custom page class 'Object' should extend Capybara::PageObject::Page")
+      expect { Capybara::PageObject::Website.new(capybara_page, 'pages/pages.yml') }.to raise_error(Exception, "Custom page class 'Object' should extend Capybara::PageObject::Page")
     end
   end
 
   describe "page block" do
-    it "should evaluate calls within the block on page" do
+    it "should resolve rspec matchers within the block on page" do
       with_yaml("home_page" => {"url" => "/form", "attributes" => {"attribute" => "#attr1", "field" => "#hidden_field"}})
       website.home_page.visit
       website.home_page do
         attribute.should == "led zeppelin"
+        attribute.should be_present
         field.should_not be_visible
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-pageobject
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152272000 !ruby/object:Gem::Requirement
+  requirement: &2156144500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152272000
+  version_requirements: *2156144500
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152270840 !ruby/object:Gem::Requirement
+  requirement: &2156141140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152270840
+  version_requirements: *2156141140
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152267160 !ruby/object:Gem::Requirement
+  requirement: &2156139320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.4
   type: :development
   prerelease: false
-  version_requirements: *2152267160
+  version_requirements: *2156139320
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2152190040 !ruby/object:Gem::Requirement
+  requirement: &2156062360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152190040
+  version_requirements: *2156062360
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2152188600 !ruby/object:Gem::Requirement
+  requirement: &2156061060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,18 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152188600
+  version_requirements: *2156061060
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: &2156059420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156059420
 description: Introduce page objects to your capybara-based functional tests
 email:
 - deepak.lewis@gmail.com