frameworks-capybara 0.1.17 → 0.1.18

data/VERSION

@@ -1 +1 @@
-0.1.17
+0.1.18

data/frameworks-capybara.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frameworks-capybara}
-  s.version = "0.1.17"
+  s.version = "0.1.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcrmfc"]
-  s.date = %q{2012-03-05}
+  s.date = %q{2012-03-27}
   s.description = %q{gem to aid setup of Capybara for testing bbc sites}
   s.email = %q{mcrobbins@gmail.com}
   s.extra_rdoc_files = [

data/lib/frameworks/cucumber.rb

@@ -17,21 +17,22 @@ module Frameworks
     include W3CValidators
     #Generate base urls to use in Cucumber step defs
     def generate_base_urls 
+      environment = ENV['ENVIRONMENT'].downcase #be defensive
       set_scheme
-      if(ENV['ENVIRONMENT']=='sandbox')
+      if(environment =='sandbox')
         @base_url = @sandbox + @bbc_domain 
         @static_base_url = @static_sandbox + @bbc_domain
-      elsif (ENV['ENVIRONMENT']=='live' && ENV['WWW_LIVE']=='false')
+      elsif (environment =='live' && ENV['WWW_LIVE']=='false')
         @base_url = @www_prefix.chop + @bbc_domain
         @static_base_url = @static_prefix.chop + @bbci_domain
         @open_base_url = @open_prefix.chop + @bbc_domain
-      elsif (ENV['ENVIRONMENT'].split('.')[0].include? 'pal') #address specific box
+      elsif (environment.split('.')[0].include? 'pal') #address specific box
         @base_url = "#{scheme}://#{ENV['ENVIRONMENT']}" 
       else
-        @base_url = @www_prefix + ENV['ENVIRONMENT'] + @bbc_domain
-        @static_base_url = @static_prefix + ENV['ENVIRONMENT'] + @bbci_domain
-        @static_base_url = @static_prefix.chop + @bbci_domain if ENV['ENVIRONMENT'] == 'live'
-        @open_base_url = @open_prefix + ENV['ENVIRONMENT'] + @bbc_domain
+        @base_url = @www_prefix + environment + @bbc_domain
+        @static_base_url = @static_prefix + environment + @bbci_domain
+        @static_base_url = @static_prefix.chop + @bbci_domain if environment == 'live'
+        @open_base_url = @open_prefix + environment + @bbc_domain
       end
       proxy = ENV['http_proxy'] || ENV['HTTP_PROXY'] 
       @proxy_host = proxy.scan(/http:\/\/(.*):80/).to_s if proxy

data/spec/frameworks_cucumber_spec.rb

@@ -32,8 +32,25 @@ describe Frameworks::EnvHelper do
       @open_base_url.should == 'http://open.live.bbc.co.uk'
     end
 
-    it "should be able to set a 'classic' live url" do
-      ENV['ENVIRONMENT'] = 'live'
+    it "should be able to set a base url and not be case sensitive" do
+      ENV['ENVIRONMENT'] = 'fOo'
+      generate_base_urls
+      @base_url.should == 'http://www.foo.bbc.co.uk'
+      @static_base_url.should == 'http://static.foo.bbci.co.uk'
+      @open_base_url.should == 'http://open.foo.bbc.co.uk'
+    end
+
+    it "should set correct static base for www.live.bbc.co.uk and not be case sensitive" do
+      ENV['ENVIRONMENT'] = 'LiVe'
+      generate_base_urls
+      @base_url.should == 'http://www.live.bbc.co.uk'
+      @static_base_url.should == 'http://static.bbci.co.uk'
+      @open_base_url.should == 'http://open.live.bbc.co.uk'
+    end
+
+
+    it "should be able to set a 'classic' live url and not be case sensitive" do
+      ENV['ENVIRONMENT'] = 'Live'
       ENV['WWW_LIVE'] = 'false' 
       generate_base_urls
       @base_url.should == 'http://www.bbc.co.uk'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 1
-  - 17
-  version: 0.1.17
+  - 18
+  version: 0.1.18
 platform: ruby
 authors: 
 - mcrmfc
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-05 00:00:00 +00:00
+date: 2012-03-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency