browsercuke 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.1.3 / 2010-01-07
+
+* Changing copyright notice
+* Fixed sapphirecuke's browser argument, and removed the use of environment variables.
+* Include a sample test, google-search.feature, and insturctions in the readme.
+
 === 0.1.2 / 2010-01-07
 
 * Reformatted license

data/README.md

@@ -52,9 +52,37 @@ You will also need to make some changes on your system to get the browser
 
 ## SYNOPSIS:
 
-Run something like this to execute a test freature.
+Now it's time to create your first test.  As an example, we will test Google's search.  Create a
+file called `google-search.feature` and put this content into it.
 
-   browsercuke http://localhost/yoursite create-page.feature
+    Feature: Google Search
+    	As a user of the web
+    	I want to search for interesting websites
+    	So that I can find things on the web.
+
+    	Scenario: Search for SilverStripe
+    		Given I visit /
+    		When I put "SilverStripe" in the "q" field
+    		And I click the "Google Search" button
+    		Then I see "www.silverstripe.com"
+    		And I see "Open Source CMS / Framework"
+
+Run your test with this command.  You should see the text of your test printed in green, as it
+executes each line of the test.
+
+    $ browsercuke firefox http://www.google.com google-search.feature
+
+The arguments are as follows:
+
+ * `firefox` - the first argument specifies the browser: "firefox" or "safari"
+ * `http://www.google.com` - the second argument specifies the root URL of your site.  All URLs in
+   the test are specified relative to this URL.  That makes it easy to run your tests on different
+   instances of your application.
+ * `google-search.feature` - the final argument is the name of the .feature file to run.  You can
+   pass multiple files, or use wildcards, if you prefer.
+
+In addition to these arguments, you can pass any other cucumber arguments.  Call `cucumber --help`
+for more information.
 
 ### Using BrowserCuke to run tests from another project
 
@@ -218,7 +246,7 @@ To create a new release of the gem, to the following:
 
 Browsercuke is licensed under the BSD license
 
-Copyright (c) 2009, Sam Minnée  
+Copyright (c) 2009, SilverStripe Limited  
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/bin/browsercuke

@@ -33,8 +33,9 @@ end
 
 # Pass data along to cucumber
 extraArgs = ARGV.dup
-ENV['BROWSERSALAD_BROWSER'] = extraArgs.shift
-ENV['BROWSERSALAD_URL'] = extraArgs.shift
+
+$browserName = extraArgs.shift
+$baseURL = extraArgs.shift
 
 # We can't reassign ARGV but we can manipulate its contents
 ARGV.clear

data/bin/sapphirecuke

@@ -12,15 +12,27 @@ I couldn't find ./sapphire/main.php.
 	exit 2
 end
 
-# We can't reassign ARGV but we can manipulate its contents
-browser = ARGV[1]
+browser = ARGV[0]
 baseURL = `php ./sapphire/cli-script.php SapphireInfo/baseurl`
-features = "*/tests/cuke/*.feature"
 
+# By default, use "*/tests/cuke/*.feature" as the features
+if ARGV.count == 1 then
+  features = []
+  Dir.glob("*/tests/cuke/*.feature").each { |filename|
+    features << filename
+  }
+
+# Otherwise take the feature from ARGV
+else
+  features = ARGV.dup
+  features.shift
+end
+
+# We can't reassign ARGV but we can manipulate its contents
 ARGV.clear
 ARGV << browser
 ARGV << baseURL
-ARGV << features
+features.each { |item| ARGV << item }
 
 # Call browsercuke
 load File.dirname(__FILE__) + '/browsercuke'

data/google-search.feature

@@ -0,0 +1,11 @@
+Feature: Google Search
+	As a user of the web
+	I want to search for interesting websites
+	So that I can find things on the web.
+	
+	Scenario: Search for SilverStripe
+		Given I visit /
+		When I put "SilverStripe" in the "q" field
+		And I click the "Google Search" button
+		Then I see "www.silverstripe.com"
+		And I see "Open Source CMS / Framework"

data/lib/browsercuke.rb

@@ -2,6 +2,6 @@
 # In time, the non-Watir ruby code that the step definitions make use of can be moved into this.
 module BrowserCuke
   class BrowserCuke
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/support/env.rb

@@ -2,7 +2,7 @@ require 'spec'
 
 $killFF = false
  
-if ENV['BROWSERSALAD_BROWSER'] and ENV['BROWSERSALAD_BROWSER'].downcase == 'safari'
+if $browserName and $browserName.downcase == 'safari'
   require 'safariwatir'
   Browser = Watir::Safari
 else
@@ -73,8 +73,7 @@ end
 # Set up 
 $browser = Browser.new
 
-if ENV['BROWSERSALAD_URL'] then
-  $baseURL = ENV['BROWSERSALAD_URL']
+if $baseURL then
   if not $baseURL.match(/\/$/) then
       $baseURL += '/'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: browsercuke
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - "Sam Minn\xC3\xA9e"
@@ -88,6 +88,7 @@ files:
 - Rakefile
 - bin/browsercuke
 - bin/sapphirecuke
+- google-search.feature
 - lib/browsercuke.rb
 - step_definitions/browser/README.md
 - step_definitions/browser/ajax.rb