pagemodels 0.1.1 → 0.1.2

data/lib/page_models/base.rb

@@ -1,7 +1,11 @@
 module PageModels  
   class Base    
     def open!
-      visit(url)
+      if config.driver.class.to_s == "Capybara::Session"
+        visit(full_url)
+      else
+        goto(full_url)
+      end
       verify!
     end    
     
@@ -24,5 +28,9 @@ module PageModels
     def config
       PageModels::Configuration.instance
     end
+    
+    def full_url
+      url =~ /^https?:\/\// ? url : config.base_url + url
+    end
   end
 end

data/lib/page_models/configuration.rb

@@ -4,10 +4,17 @@ module PageModels
   class Configuration
     include Singleton
     attr_writer :driver
+    attr_accessor :base_url
     
     def initialize
+      reset!
+    end
+    
+    def reset!
       @driver = :capybara
+      @base_url = "http://localhost:3000"
       @frameworks = []
+      @driver_instance = nil
     end
         
     def integrate(framework)
@@ -19,11 +26,15 @@ module PageModels
     end
     
     def driver
-      case @driver
-        when :capybara
-          Capybara.current_session
-        else
-          raise ConfigurationError.new("No driver configured.")
+      @driver_instance ||= begin
+        case @driver
+          when :capybara
+            Capybara.current_session
+          when :celerity
+            Celerity::Browser.new
+          else
+            Watir::Browser.new(@driver)
+        end
       end
     end
   end

data/lib/page_models/integration/cucumber.rb

@@ -1,13 +1,18 @@
-Given /^I open the (.+ page)(.*)$/ do |page, args|
+Given /^I (?:open|visit|go to) the (.+\s?page)(.*)$/ do |page, args|
   self.page_model = PageModels.create(page, args)
   page_model.open!
 end
 
-Then /^I should see the (.+ page)(.*)$/ do |page, args|
+Then /^I should (?:see|be on) the (.+\s?page)(.*)$/ do |page, args|
   self.page_model = PageModels.create(page, args)
   page_model.verify!
 end
 
+at_exit do
+  driver = PageModels::Configuration.instance.driver
+  driver.close if driver.class.to_s == "Watir::Browser"
+end
+
 module PageModels
   module CucumberIntegration
     attr_accessor :page_model

data/lib/page_models/version.rb

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

data/spec/page_models/base_spec.rb

@@ -5,8 +5,12 @@ describe PageModels::Base do
   end
   
   class TestPageModel < PageModels::Base
+    def initialize(url="http://test-page")
+      @url = url
+    end
+    
     def url
-      "/test-page"
+      @url
     end
     
     def verify!
@@ -41,18 +45,65 @@ describe PageModels::Base do
     end
   end
   
-  describe "opening a page" do
+  describe "constructing page URLs" 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
+      pm = TestPageModel.new("/foo")
+      pm.should_receive(:visit).with("https://1.2.3.4:4321/foo")
+      pm.should_receive(:verify!)
+      pm.open!
+    end
+    
+    it "ignores base URL if http:// is specified" do
+      pm = TestPageModel.new("http://foo")
+      pm.should_receive(:visit).with("http://foo")
+      pm.should_receive(:verify!)
+      pm.open!
+    end
+    
+    it "ignores base URL if https:// is specified" do
+      pm = TestPageModel.new("https://foo")
+      pm.should_receive(:visit).with("https://foo")
+      pm.should_receive(:verify!)
+      pm.open!
+    end    
+  end
+  
+  describe "opening a page with driver" do
     before(:each) do
-      @driver = Object.new
-      PageModels::Configuration.instance.stub(:driver).and_return(@driver)
       @page_model = TestPageModel.new
     end
     
-    it "should visit the page, then call verify" do
-      @page_model.should_receive(:visit).with("/test-page")
-      @page_model.should_receive(:verify!)
-      @page_model.open!
+    describe "for capybara" do
+      it "should visit the page, then call verify" do
+        PageModels::Configuration.instance.stub(:driver).and_return(Capybara::Session.new)
+        @page_model.should_receive(:visit).with("http://test-page")
+        @page_model.should_receive(:verify!)
+        @page_model.open!
+      end
     end
     
+    describe "for celerity" do
+      it "should goto the page, then call verify" do
+        PageModels::Configuration.instance.stub(:driver).and_return(Celerity::Browser.new)
+        @page_model.should_receive(:goto).with("http://test-page")
+        @page_model.should_receive(:verify!)
+        @page_model.open!
+      end
+    end   
+    
+    describe "for watir-webdriver" do
+      it "should goto the page, then call verify" do
+        PageModels::Configuration.instance.stub(:driver).and_return(Watir::Browser.new(:chrome))
+        @page_model.should_receive(:goto).with("http://test-page")
+        @page_model.should_receive(:verify!)
+        @page_model.open!
+      end
+    end 
   end
 end

data/spec/page_models/configuration_spec.rb

@@ -1,26 +1,52 @@
 require File.expand_path(File.dirname(__FILE__) + "../../spec_helper")
 
-module Capybara
-  def self.current_session
-    @session ||= Object.new
-  end
-end
-
 describe PageModels::Configuration do
   before(:each) do
     @config = PageModels::Configuration.instance
+    @config.reset!
   end
   
-  describe "providing a driver" do
-    it "should raise an error if no driver is configured" do
-      @config.driver = nil
-      lambda { @config.driver }.should raise_error(PageModels::ConfigurationError)
-    end
-    
+  describe "providing a driver" do        
     it "should provide a Capybara session" do
       @config.driver = :capybara
       @config.driver.should == Capybara.current_session
     end
+    
+    it "should provide a Celerity browser" do
+      @config.driver = :celerity
+      @config.driver.should be_a Celerity::Browser
+    end
+    
+    describe "for watir-webdriver" do    
+      it "should support Chrome" do
+        @config.driver = :chrome
+        @config.driver.should be_a Watir::Browser
+        @config.driver.browser.should == :chrome
+      end
+      
+      it "should support Chrome" do
+        @config.driver = :firefox
+        @config.driver.should be_a Watir::Browser
+        @config.driver.browser.should == :firefox
+      end
+      
+      it "should support IE" do
+        @config.driver = :ie
+        @config.driver.should be_a Watir::Browser
+        @config.driver.browser.should == :ie
+      end
+    end
+    
+    it "should return the same instance every time" do
+      @config.base_url.should == "http://localhost:3000"
+      @config.driver = :celerity
+      @config.driver.should === @config.driver
+    end
+  end
+  
+  it "provides a base URL" do
+    @config.base_url = "https://1.2.3.4:4321"
+    @config.base_url.should == "https://1.2.3.4:4321"
   end
   
   describe "integrating with frameworks" do

data/spec/spec_helper.rb

@@ -1 +1,24 @@
-require File.join(File.dirname(__FILE__), "..", "lib", "pagemodels")
+require File.join(File.dirname(__FILE__), "..", "lib", "pagemodels")
+
+module Capybara
+  class Session
+  end
+  
+  def self.current_session
+    @session ||= Session.new
+  end
+end
+
+module Watir
+  class Browser
+    attr_reader :browser
+    def initialize(browser)
+      @browser = browser
+    end
+  end
+end
+
+module Celerity
+  class Browser
+  end
+end

metadata

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