pagemodels 0.1.2 → 0.1.3

data/README.txt

@@ -6,7 +6,8 @@ Page Models move complex and copy-pasted code out of your acceptance tests and i
 require 'pagemodels'
 
 PageModels.configure do |config|
-  config.driver = :capybara
+  config.driver = :capybara  # Or :celerity, :firefox, :chrome, :ie (browsers will use watir-webdriver)
+  config.base_url = "https://www.github.com"
   config.integrate :rspec
   config.integrate :cucumber
   config.integrate :rails
@@ -23,11 +24,11 @@ Then I should see at least 3 commits
 ~~~~~~~~~~~~~~~~~~~~~~
 # my_cucumber_steps.rb
 When /I look at the commit history/ do
-  page_model.navigate_to_commits
+  page.navigate_to_commits
 end
 
 Then /I should see at least (\d+) commits/ do |count|
-  page_model.verify_commit_count(count)
+  page.verify_commit_count(count)
 end
 
 
@@ -39,7 +40,7 @@ class GitHubProjectPage < PageModels::Base
   end
   
   def url
-    "https://www.github.com/#{@user}/#{@repo}/"
+    "/#{@user}/#{@repo}/"
   end
   
   def verify!

data/lib/page_models/core.rb

@@ -9,7 +9,11 @@ module PageModels
     args = args.scan(/"([^"]+)"/).map(&:first)
     page_model_class_name = page.gsub(/(?:^|[^\w])([a-z])/) { $1.upcase }
     Kernel.const_get(page_model_class_name).new(*args)
-  rescue NameError
-    raise MissingPageModelError.new(page_model_class_name)
+  rescue NameError => e
+    if e.instance_of?(NameError) # Could be a NoMethodError
+      raise MissingPageModelError.new(page_model_class_name)
+    else
+      raise e
+    end
   end
 end

data/lib/page_models/integration/cucumber.rb

@@ -1,11 +1,13 @@
-Given /^I (?:open|visit|go to) the (.+\s?page)(.*)$/ do |page, args|
-  self.page_model = PageModels.create(page, args)
-  page_model.open!
+Given /^I (?:open|visit|go to) the (.+\s?page)(.*)$/ do |page_name, args|
+  self.page = PageModels.create(page_name, args)
+  self.page_model = self.page
+  self.page.open!
 end
 
-Then /^I should (?:see|be on) the (.+\s?page)(.*)$/ do |page, args|
-  self.page_model = PageModels.create(page, args)
-  page_model.verify!
+Then /^I should (?:see|be on) the (.+\s?page)(.*)$/ do |page_name, args|
+  self.page = PageModels.create(page_name, args)
+  self.page_model = self.page
+  self.page.verify!
 end
 
 at_exit do
@@ -15,7 +17,7 @@ end
 
 module PageModels
   module CucumberIntegration
-    attr_accessor :page_model
+    attr_accessor :page, :page_model
   end
 end
 World(PageModels::CucumberIntegration)

data/lib/page_models/version.rb

@@ -1,3 +1,3 @@
 module PageModels
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/page_models/base_spec.rb

@@ -18,10 +18,15 @@ describe PageModels::Base do
     end
   end
   
+  before(:each) do
+    PageModels::Configuration.instance.stub(:driver).and_return(Watir::Browser.new(:chrome))
+    @page_model = TestPageModel.new
+  end
+  
   describe "template methods which must be implemented by your page models" do
     it "should raise an error if page models do not implement #url" do
       lambda { UnimplementedPageModel.new.url }.should raise_error(PageModels::ImplementationError)
-    end    
+    end
     
     it "should raise an error if page models do not implement #verify!" do
       lambda { UnimplementedPageModel.new.verify! }.should raise_error(PageModels::ImplementationError)
@@ -29,14 +34,8 @@ describe PageModels::Base do
   end
   
   describe "delegating methods to the driver for less verbose page models" do
-    before(:each) do
-      @driver = Object.new
-      PageModels::Configuration.instance.stub(:driver).and_return(@driver)
-      @page_model = TestPageModel.new
-    end
-    
     it "should delegate a missing method to the driver" do
-      @driver.should_receive(:do_something_cool).with(:please)
+      PageModels::Configuration.instance.driver.should_receive(:do_something_cool).with(:please)
       @page_model.do_something_cool(:please)
     end
     
@@ -49,7 +48,6 @@ describe PageModels::Base do
     before(:each) do
       PageModels::Configuration.instance.stub(:driver).and_return(Capybara::Session.new)
       PageModels::Configuration.instance.base_url = "https://1.2.3.4:4321"
-      @page_model = TestPageModel.new
     end
     
     it "uses the base URL from config" do
@@ -74,11 +72,7 @@ describe PageModels::Base do
     end    
   end
   
-  describe "opening a page with driver" do
-    before(:each) do
-      @page_model = TestPageModel.new
-    end
-    
+  describe "opening a page with driver" do    
     describe "for capybara" do
       it "should visit the page, then call verify" do
         PageModels::Configuration.instance.stub(:driver).and_return(Capybara::Session.new)

metadata

@@ -2,7 +2,7 @@
 name: pagemodels
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Rick Grundy
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-14 00:00:00 +08:00
+date: 2012-02-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency