frameworks-capybara 0.2.23 → 0.2.24

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (0.2.23)
+    frameworks-capybara (0.2.24)
       capybara (>= 1.0.0)
       capybara-celerity
       capybara-mechanize (>= 0.3.0)

data/README.rdoc

@@ -79,11 +79,18 @@ Finally this gem contains some useful monkey-patches to core libraries e.g. Capy
 == Release instructions
 
 * Run tests - 'rake'
+* If you have not published with 'gem' before, run 'gem push' to enter your credentials (ignore failed publish error at the end)
 * Bump version - manually update file in lib/version.rb
 * Run 'bundle install --binstubs --path vendor/to' bundle pick up new version in Gemfile
 * Commit 'Gemfile.lock' changes
 * Release - 'rake release'
-* Push new tag to Github 'git push --tags'
+
+You should see something like:
+
+  frameworks-capybara 0.2.23 built to pkg/frameworks-capybara-0.2.23.gem
+  Tagged v0.2.23
+  Pushed git commits and tags
+  Pushed frameworks-capybara 0.2.23 to rubygems.org
 
 == Contributing to frameworks-capybara
  

data/lib/frameworks/cucumber.rb

@@ -27,15 +27,15 @@ module Frameworks
         @pal_base_url = @sandbox + @bbc_domain 
         @ssl_base_url = @sslsandbox + @bbc_domain
         @static_base_url = @static_sandbox + @bbc_domain
-        @mobile_base_url = @mobiledot_prefix + "sandbox.dev.bbc.co.uk"
-        @m_base_url = @mdot_prefix + "sandbox.dev.bbc.co.uk"
+        @mobile_base_url = @mobiledot_prefix + "sandbox.dev" + @bbc_domain
+        @m_base_url = @mdot_prefix + "sandbox.dev" + @bbc_domain
       elsif(environment =='sandbox6')
         @base_url = @sandbox6 + @bbc_domain 
         @pal_base_url = @sandbox6 + @bbc_domain 
         @ssl_base_url = @sslsandbox6 + @bbc_domain
         @static_base_url = @static_sandbox6 + @bbc_domain
-        @mobile_base_url = @mobiledot_prefix + "sandbox.bbc.co.uk"
-        @m_base_url = @mdot_prefix + "sandbox.bbc.co.uk"
+        @mobile_base_url = @mobiledot_prefix + "sandbox" + @bbc_domain
+        @m_base_url = @mdot_prefix + "sandbox" + @bbc_domain
       elsif (environment =='live' && ENV['WWW_LIVE']=='false')
         @base_url = @www_prefix.chop + @bbc_domain
         @pal_base_url = @pal_prefix + environment + @bbc_domain
@@ -99,7 +99,7 @@ module Frameworks
       @ssl_prefix = "https://ssl."
       @static_prefix = "#{scheme}://static."
       @open_prefix = "#{scheme}://open."
-      @bbc_domain = '.bbc.co.uk'
+      @bbc_domain = '.' + (ENV['FW_BBC_DOMAIN'] || 'bbc.co.uk')
       @bbci_domain = '.bbci.co.uk'
       @sandbox = "#{scheme}://pal.sandbox.dev"
       @sandbox6 = "#{scheme}://sandbox"

data/lib/version.rb

@@ -1,3 +1,3 @@
 module FrameworksCapybara
-  VERSION = '0.2.23'
+  VERSION = '0.2.24'
 end

data/spec/frameworks_cucumber_spec.rb

@@ -164,6 +164,53 @@ describe Frameworks::EnvHelper do
       @proxy_port.should be_nil
     end
 
+    it "should be able to set a local url with expected domain" do
+      ENV['ENVIRONMENT'] = 'sandbox'
+      ENV['FW_BBC_DOMAIN'] = 'bbc.com'
+      generate_base_urls
+      @base_url.should == 'http://pal.sandbox.dev.bbc.com'
+      @ssl_base_url.should == 'https://ssl.sandbox.dev.bbc.com'
+      @static_base_url.should == 'http://static.sandbox.dev.bbc.com'
+      @m_base_url.should == 'http://m.sandbox.dev.bbc.com'
+      @mobile_base_url.should == 'http://mobile.sandbox.dev.bbc.com'
+    end
+
+    it "should be able to set a local system6 url with expected domain" do
+      ENV['ENVIRONMENT'] = 'sandbox6'
+      ENV['FW_BBC_DOMAIN'] = 'bbc.com'
+      generate_base_urls
+      @base_url.should == 'http://sandbox.bbc.com'
+      @ssl_base_url.should == 'https://ssl.sandbox.bbc.com'
+      @static_base_url.should == 'http://static.sandbox.bbc.com'
+      @m_base_url.should == 'http://m.sandbox.bbc.com'
+      @mobile_base_url.should == 'http://mobile.sandbox.bbc.com'
+    end
+
+    it "should be able to set a base url with expected domain" do
+      ENV['ENVIRONMENT'] = 'foo'
+      ENV['FW_BBC_DOMAIN'] = 'bbc.com'
+      generate_base_urls
+      @base_url.should == 'http://www.foo.bbc.com'
+      @ssl_base_url.should == 'https://ssl.foo.bbc.com'
+      @static_base_url.should == 'http://static.foo.bbci.co.uk'
+      @open_base_url.should == 'http://open.foo.bbc.com'
+      @m_base_url.should == 'http://m.foo.bbc.com'
+      @mobile_base_url.should == 'http://mobile.foo.bbc.com'
+    end
+
+    it "should set public facing live domain" do
+      ENV['ENVIRONMENT'] = 'live'
+      ENV['WWW_LIVE'] = 'false'
+      ENV['FW_BBC_DOMAIN'] = 'bbc.com'
+      generate_base_urls
+      @base_url.should == 'http://www.bbc.com'
+      @ssl_base_url.should == 'https://ssl.bbc.com'
+      @static_base_url.should == 'http://static.bbci.co.uk'
+      @open_base_url.should == 'http://open.bbc.com'
+      @m_base_url.should == 'http://m.bbc.com'
+      @mobile_base_url.should == 'http://mobile.bbc.com'
+    end
+
 =begin
 #don't want to push proxy addr online
     it "should be able to validate xhtml online" do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 2
-  - 23
-  version: 0.2.23
+  - 24
+  version: 0.2.24
 platform: ruby
 authors: 
 - matt robbins
@@ -15,142 +14,125 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-13 00:00:00 Z
+date: 2013-04-11 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: capybara
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
+  name: capybara
   requirement: *id001
-  type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: capybara-mechanize
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 3
         - 0
         version: 0.3.0
+  name: capybara-mechanize
   requirement: *id002
-  type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: json
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  name: json
   requirement: *id003
-  type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: headless
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  name: headless
   requirement: *id004
-  type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: capybara-celerity
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  name: capybara-celerity
   requirement: *id005
-  type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: w3c_validators
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  name: w3c_validators
   requirement: *id006
-  type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: cucumber
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
         segments: 
         - 0
         - 10
         - 5
         version: 0.10.5
+  name: cucumber
   requirement: *id007
-  type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rake
+- !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  name: rake
   requirement: *id008
-  type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec
+- !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
+  name: rspec
   requirement: *id009
-  type: :development
+  prerelease: false
 description: Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches
 email: 
 - mcrobbins@gmail.com
@@ -191,6 +173,7 @@ files:
 - spec/profiles.ini
 - spec/spec_helper.rb
 - spec/unit_test_monkeypatches.rb
+has_rdoc: true
 homepage: 
 licenses: []
 
@@ -200,27 +183,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches