culerity 0.2.3 → 0.2.4

data/{README.textile → README.md}

@@ -1,4 +1,4 @@
-h2. Introduction
+## Introduction
 
 Culerity integrates Cucumber and Celerity in order to test your application's full stack.
 
@@ -7,47 +7,48 @@ Culerity lets you:
 * run your application in any Ruby (like MRI 1.8.6) while Celerity runs in JRuby so you can still use gems/plugins that would not work with JRuby
 * reuse existing Webrat-Style step definitions
 
-h2. Getting Started
+## Getting Started
 
 The following guide is written for a Rails application (tested with 2.2.2) but Culerity should work with any other Web Framework that is supported by Cucumber.
 
 First download JRuby and unpack it to some location, for example $HOME/jruby. Make sure that the jruby executable is in your path. You can do this by either setting your PATH accordingly...
 
-<pre><code> export PATH=$HOME/jruby/bin:$PATH</code></pre>
+    export PATH=$HOME/jruby/bin:$PATH
  
 ... or by creating a symlink from your bin directory:
 
-<pre><code> ln -s $HOME/jruby/bin/jruby /usr/bin/jruby</code></pre>
+    ln -s $HOME/jruby/bin/jruby /usr/bin/jruby
+
+You will need the celerity gem installed into JRuby:
+
+    jruby -S gem install celerity
 
 Now (assuming you have a Rails application set up already) install Culerity as a Rails Plugin:
 
-<pre><code> cd RAILS_ROOT
- git clone git://github.com/langalex/culerity.git</code></pre>
+    cd RAILS_ROOT
+    git clone git://github.com/langalex/culerity.git
 
 or as a gem: (definitely preferred)
 
-<pre><code> gem install langalex-culerity --source http://gems.github.com</code></pre>
+    gem install langalex-culerity --source http://gems.github.com
  
 Run the RSpec, Cucumber and Culerity generators:
 
-<pre><code>
- cd RAILS_ROOT
- script/generate rspec
- script/generate cucumber
- script/generate culerity
-</code></pre>
+    cd RAILS_ROOT
+    script/generate rspec
+    script/generate cucumber
+    script/generate culerity
 
 This creates the features folder and a file common_celerity.rb into your application. This file contains step definitions for basic interactions like clicking links or filling out forms.
 
 Culerity is a Ruby-side interface to celerity running on JRuby. To install it:
 
-<pre><code> rake culerity:install</code></pre>
+    rake culerity:install
  
 After you have written a first feature you can run it just like you would run a standard cucumber feature. The only difference is that you have to start a web server (e.g. mongrel) with the test environment enabled beforehand.
 
-<pre><code> rake culerity:rails:start
- cucumber features/my_feature.feature
-</code></pre>
+    rake culerity:rails:start
+    cucumber features/my_feature.feature
 
 The Rails instance uses a special environment culerity_development.
 
@@ -55,45 +56,49 @@ When you have finished running culerity/cucumber you can turn off the Rails inst
 
 NOTE: The default port for this server is 3001. You can change this in features/step_definitions/common_celerity.rb
 
-<pre><code> rake culerity:rails:stop</code></pre>
+    rake culerity:rails:stop
 
-h2. How does it work
+## How does it work
 
 While Celerity is based on Java and requires JRuby to run, with Culerity you can still run your tests in your own Ruby Environment. When you run your features a separate JRuby process for Celerity is spawned and all Celerity Commands are redirected to this other process.
 
-h2. Troubleshooting
+## Troubleshooting
 
 I get a broken pipe error:
+
 * make sure JRuby is installed and in your path: running _jruby -v_ should not produce an error
 
 I get _Connection Refused_ errors
+
 * make sure you have started a server in the test environment that runs on port 3001
 
 My application can't find the data I create in my steps
+
 * make sure you have disabled transactional fixtures in your env.rb
 
 My database is not cleared automatically between scenarios
+
 * Rails can't clean the database because you had to disable transactional fixtures - which only work if your test process is the same as your web server process. Hence you have to clean your database manually. A quick way would be:
 
-<pre><code>Before do
-  [User, .... all your models].each do |model|
-    mode.delete_all
-  end
-end
-</code></pre>
+    Before do
+      [User, .... all your models].each do |model|
+        mode.delete_all
+      end
+    end
 
 I want to test emails but the ActionMailer::Base.deliveries array is always empty.
+
 * that's because the :test delivery method stores all emails in memory, but now that your test process is not the same as your rails process you don't have access to that array. install the http://github.com/ngty/action_mailer_cache_delivery plugin to access the emails in your rails process via a temporary file
 
 
-h2. Links to Celerity documentation
+## Links to Celerity documentation
 
 * "How to select elements":http://celerity.rubyforge.org/yard/Celerity/Container.html
 * "FAQ":http://wiki.github.com/jarib/celerity/faq
 * "Tutorial":http://wiki.github.com/jarib/celerity/getting-started
 * "API docs":http://celerity.rubyforge.org/yard/
 
-h2. Links
+## Links
 
 * "cucumber":http://github.com/aslakhellesoy/cucumber/wikis
 * "celerity":http://celerity.rubyforge.org
@@ -101,6 +106,6 @@ h2. Links
 * "rspec":http://rspec.info
 * "htmlunit":http://htmlunit.sourceforge.net/
 
-h2. Contact
+## Contact
 
 Written 2009 by Alexander Lang, contact alex[at]upstream-berlin.com or http://github.com/langalex, released under the MIT license

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rake'
-require 'rake/testtask'
+require 'spec/rake/spectask'
 require 'rake/rdoctask'
-# require 'rcov/rcovtask'
 
 begin
   require 'rubygems' unless ENV['NO_RUBYGEMS']
@@ -20,10 +19,9 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
-Rake::TestTask.new do |t|
-  t.libs << 'lib'
-  t.pattern = 'spec/**/*_spec.rb'
-  t.verbose = false
+desc "Run all unit specs"
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_files = FileList['spec/*_spec.rb']
 end
 
 Rake::RDocTask.new do |rdoc|
@@ -34,10 +32,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-# Rcov::RcovTask.new do |t|
-#   t.libs << 'spec'
-#   t.test_files = FileList['spec/**/*_spec.rb']
-#   t.verbose = true
-# end
-
-task :default => :test
+task :default => :spec

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 3
+:patch: 4

data/culerity.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{culerity}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Lang"]
-  s.date = %q{2009-09-08}
+  s.date = %q{2009-11-22}
   s.description = %q{Culerity integrates Cucumber and Celerity in order to test your application's full stack.}
   s.email = %q{alex@upstream-berlin.com}
   s.extra_rdoc_files = [
-    "README.textile"
+    "README.md"
   ]
   s.files = [
     ".gitignore",
      "MIT-LICENSE",
-     "README.textile",
+     "README.md",
      "Rakefile",
      "VERSION.yml",
      "culerity.gemspec",
@@ -38,12 +38,13 @@ Gem::Specification.new do |s|
      "rails_generators/culerity/culerity_generator.rb",
      "rails_generators/culerity/templates/config/environments/culerity_continuousintegration.rb",
      "rails_generators/culerity/templates/config/environments/culerity_development.rb",
-     "rails_generators/culerity/templates/features/step_definitions/common_celerity_steps.rb",
+     "rails_generators/culerity/templates/features/step_definitions/culerity_steps.rb",
      "rails_generators/culerity/templates/lib/tasks/culerity.rake",
      "script/console",
      "script/destroy",
      "script/generate",
      "spec/celerity_server_spec.rb",
+     "spec/culerity_spec.rb",
      "spec/remote_browser_proxy_spec.rb",
      "spec/remote_object_proxy_spec.rb",
      "spec/spec_helper.rb"
@@ -55,6 +56,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Culerity integrates Cucumber and Celerity in order to test your application's full stack.}
   s.test_files = [
     "spec/celerity_server_spec.rb",
+     "spec/culerity_spec.rb",
      "spec/remote_browser_proxy_spec.rb",
      "spec/remote_object_proxy_spec.rb",
      "spec/spec_helper.rb"

data/features/installing_culerity.feature

@@ -24,7 +24,7 @@ Feature: Installing culerity
     Then file "tmp/culerity_rails_server.pid" is not created
 
   Scenario: Install culerity into a Rails app and check it works
-    Then file "features/step_definitions/common_celerity_steps.rb" is created
+    Then file "features/step_definitions/culerity_steps.rb" is created
     Then file "config/environments/culerity_development.rb" is created
     Then file "config/environments/culerity_continuousintegration.rb" is created
     

data/features/step_definitions/culerity_setup_steps.rb

@@ -1,7 +1,7 @@
 When /^I setup load path to local code$/ do
   project_lib_path = File.expand_path(File.dirname(__FILE__) + "/../../lib")
   in_project_folder do
-    force_local_lib_override(:target => 'features/step_definitions/common_celerity_steps.rb')
+    force_local_lib_override(:target => 'features/step_definitions/culerity_steps.rb')
   end
 end
 

data/lib/culerity.rb

@@ -1,6 +1,12 @@
 require File.dirname(__FILE__) + '/culerity/remote_object_proxy'
 require File.dirname(__FILE__) + '/culerity/remote_browser_proxy'
 
+Symbol.class_eval do
+  def to_proc
+    Proc.new{|object| object.send(self)}
+  end
+end unless :symbol.respond_to?(:to_proc)
+
 module Culerity
 
   module ServerCommands
@@ -16,44 +22,21 @@ module Culerity
 
   def self.run_server
     IO.popen("jruby #{__FILE__}", 'r+').extend(ServerCommands)
-
-    # open the two pipes that were created below
-    # while(!File.exists?("tmp/culerity_in.pipe")) 
-    #   sleep(1)
-    # end
-    # pipe_in = open("tmp/culerity_in.pipe", "w+")
-    # pipe_out = open("tmp/culerity_out.pipe", "r+")
-    
-    
-    
-    # store celerity pid in tmp/culerity_celerity.pid
-    # store server pid in tmp/culerity_rails_server.pid
-    
-    # open named pipes to communicate with celerity_server + return them
   end
   
-  def self.run_rails
-    unless File.exists?("tmp/culerity_rails_server.pid")
+  def self.run_rails(options = {})
+    if defined?(Rails) && !File.exists?("tmp/culerity_rails_server.pid")
       puts "WARNING: Speed up execution by running 'rake culerity:rails:start'"
-      port        = 3001
-      environment = 'culerity_development'
-      puts "Launched rails on :#{port}..."
-      return IO.popen("script/server -e #{environment} -p #{port}", 'r+')
+      port        = options[:port] || 3001
+      environment = options[:environment] || 'culerity_development'
+      rails_server = IO.popen("script/server -e #{environment} -p #{port}", 'r+')
+      sleep 5
+      rails_server
     end
   end
 end
 
 if __FILE__ == $0
-  # `rm tmp/culerity_in.pipe`
-  # `mkfifo tmp/culerity_in.pipe`
-  # `rm tmp/culerity_out.pipe`
-  # `mkfifo tmp/culerity_out.pipe`
-  # 
-  # pipe_in = open("tmp/culerity_in.pipe", "r+")
-  # p pipe_in
-  # p STDIN
-  # pipe_out = open("tmp/culerity_out.pipe", "w+")
-  # 
   require File.dirname(__FILE__) + '/culerity/celerity_server'
   Culerity::CelerityServer.new STDIN, STDOUT
 end

data/lib/culerity/celerity_server.rb

@@ -67,11 +67,11 @@ module Culerity
       end
     end
     
-    def proxify(result, in_array = false)
+    def proxify(result)
       if result.is_a?(Array)
-        result.map {|x| proxify(x, true) }.inspect
+        "[" + result.map {|x| proxify(x) }.join(", ") + "]"
       elsif [String, TrueClass, FalseClass, Fixnum, Float, NilClass].include?(result.class)
-        in_array ? result : result.inspect
+        result.inspect
       else
         @proxies[result.object_id] = result
         "Culerity::RemoteObjectProxy.new(#{result.object_id}, @io)"

data/rails_generators/culerity/culerity_generator.rb

@@ -3,7 +3,7 @@ class CulerityGenerator < Rails::Generator::Base
   def manifest
     record do |m|
       m.directory 'features/step_definitions'
-      m.file 'features/step_definitions/common_celerity_steps.rb', 'features/step_definitions/common_celerity_steps.rb'
+      m.file 'features/step_definitions/culerity_steps.rb', 'features/step_definitions/culerity_steps.rb'
       m.file 'config/environments/culerity_continuousintegration.rb', 'config/environments/culerity_continuousintegration.rb'
       m.file 'config/environments/culerity_development.rb', 'config/environments/culerity_development.rb'
 

data/rails_generators/culerity/templates/features/step_definitions/culerity_steps.rb

@@ -0,0 +1,99 @@
+require 'culerity'
+
+Before do
+  $rails_server ||= Culerity::run_rails(:environment => 'culerity', :port => 3001)
+  $server ||= Culerity::run_server
+  $browser = Culerity::RemoteBrowserProxy.new $server, {:browser => :firefox3,
+    :javascript_exceptions => true,
+    :resynchronize => true,
+    :status_code_exceptions => true
+  }
+  $browser.log_level = :warning
+  @host = 'http://localhost:3001'
+end
+
+at_exit do
+  $browser.exit if $browser
+  $server.close if $server
+  Process.kill(6, $rails_server.pid.to_i) if $rails_server
+end
+
+When /I follow "(.*)"/ do |link|
+  _link = [[:text, /^#{Regexp.escape(link)}$/], [:id, link], [:title, link]].map{|args| $browser.link(*args)}.find{|__link| __link.exist?}
+  raise "link \"#{link}\" not found" unless _link
+  _link.click
+  $browser.wait
+  assert_successful_response
+end
+
+When /I press "(.*)"/ do |button|
+  $browser.button(:text, button).click
+  assert_successful_response
+end
+
+When /I fill in "(.*)" with "(.*)"/ do |field, value|
+  find_by_label_or_id(:text_field, field).set(value)
+end
+
+When /I fill in "(.*)" for "(.*)"/ do |value, field|
+  find_by_label_or_id(:text_field, field).set(value)
+end
+
+When /I check "(.*)"/ do |field|
+  find_by_label_or_id(:check_box, field).set(true)
+end
+
+When /^I uncheck "(.*)"$/ do |field|
+  find_by_label_or_id(:check_box, field).set(true)
+end
+
+When /I select "(.*)" from "(.*)"/ do |value, field|
+  find_by_label_or_id(:select_list, field).select value
+end
+
+When /I choose "(.*)"/ do |field|
+  find_by_label_or_id(:radio, field).set(true)
+end
+
+When /I go to (.+)/ do |path|
+  $browser.goto @host + path_to(path)
+  assert_successful_response
+end
+
+When /I wait for the AJAX call to finish/ do
+  $browser.wait
+end
+
+Then /I should see "(.*)"/ do |text|
+  # if we simply check for the browser.html content we don't find content that has been added dynamically, e.g. after an ajax call
+  div = $browser.div(:text, /#{text}/)
+  div.should be_exist
+end
+
+Then /I should not see "(.*)"/ do |text|
+  div = $browser.div(:text, /#{text}/)
+  div.should_not be_exist
+end
+
+def find_by_label_or_id(element, attribute)
+  matchers = [[attribute, :id], [attribute, :name]]
+  matchers << [$browser.label(:text, attribute).for, :id] if $browser.label(:text, attribute).exist?
+  field = matchers.map{|_field, matcher| $browser.send(element, matcher, _field)}.find(&:exist?) ||  raise("#{element} not found using  \"#{attribute}\"")
+end
+
+def assert_successful_response
+  status = $browser.page.web_response.status_code
+  if(status == 302 || status == 301)
+    location = $browser.page.web_response.get_response_header_value('Location')
+    puts "Being redirected to #{location}"
+    $browser.goto location
+    assert_successful_response
+  elsif status != 200
+    filename = "culerity-#{Time.now.to_i}.html"
+    File.open(RAILS_ROOT + "/tmp/#{filename}", "w") do |f|
+      f.write $browser.html
+    end
+    `open tmp/#{filename}`
+    raise "Browser returned Response Code #{$browser.page.web_response.status_code}"
+  end
+end

data/rails_generators/culerity/templates/lib/tasks/culerity.rake

@@ -1,9 +1,9 @@
 namespace 'culerity' do
   namespace 'rails' do
     desc "Starts a rails server for cucumber/culerity tests"
-    task :start => :environment do
+    task :start do
       port = ENV['PORT'] || 3001
-      environment = 'culerity_development'
+      environment = ENV["RAILS_ENV"] || 'culerity_development'
       pid_file = RAILS_ROOT + "/tmp/culerity_rails_server.pid"
       if File.exists?(pid_file)
         puts "culerity rails server already running; if not, delete tmp/culerity_rails_server.pid and try again"
@@ -14,7 +14,7 @@ namespace 'culerity' do
     end
 
     desc "Stops the running rails server for cucumber/culerity tests"
-    task :stop => :environment do
+    task :stop do
       pid_file = RAILS_ROOT + "/tmp/culerity_rails_server.pid"
       if File.exists?(pid_file)
         pid = File.read(pid_file).to_i
@@ -30,7 +30,7 @@ namespace 'culerity' do
   end
   
   desc "Install required gems into jruby"
-  task :install => :environment do
+  task :install do
     jgem_cmd = `which jruby`.strip
     raise "ERROR: You need to install jruby to use culerity and celerity." if jgem_cmd.blank?
     sh "#{jgem_cmd} -S gem install jarib-celerity --source=http://gems.github.com"

data/spec/celerity_server_spec.rb

@@ -66,6 +66,15 @@ describe Culerity::CelerityServer do
     _out.should_receive(:<<).with("[:return, Culerity::RemoteObjectProxy.new(456, @io)]\n")
     Culerity::CelerityServer.new(_in, _out)
   end
+
+  it "should send back arrays" do
+    @browser.stub!(:goto).and_return([true, false, "test", 1, 12.3, nil, stub('123', :object_id => 456), ["test2", 32.1, 5000, nil, false, true, stub('789', :object_id => 101)]])
+    _in = stub 'in'
+    _in.stub!(:gets).and_return("[\"browser0\", \"goto\", \"/homepage\"]\n", "[\"_exit_\"]\n")
+    _out = stub 'out'
+    _out.should_receive(:<<).with("[:return, [true, false, \"test\", 1, 12.3, nil, Culerity::RemoteObjectProxy.new(456, @io), [\"test2\", 32.1, 5000, nil, false, true, Culerity::RemoteObjectProxy.new(101, @io)]]]\n")
+    Culerity::CelerityServer.new(_in, _out)
+  end
   
   it "should pass the method call to a proxy" do
     proxy = stub('123', :object_id => 456)

data/spec/culerity_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Culerity, 'run_rails' do
+  before(:each) do
+    Kernel.stub!(:sleep)
+    IO.stub!(:popen)
+    Culerity.stub!(:sleep)
+  end
+  
+  it "should not run rails if we are not using rails" do
+    IO.should_not_receive(:popen)
+    Culerity.run_rails :port => 4000, :environment => 'culerity'
+  end
+  
+  it "should run rails with default values" do
+    Rails ||= :rails
+    IO.should_receive(:popen).with("script/server -e culerity_development -p 3001", 'r+')
+    Culerity.run_rails
+  end
+  
+  it "should run rails with the given values" do
+    Rails ||= :rails
+    IO.should_receive(:popen).with("script/server -e culerity -p 4000", 'r+')
+    Culerity.run_rails :port => 4000, :environment => 'culerity'
+    
+  end
+  
+  it "should wait for the server to start up" do
+    Rails ||= :rails
+    Culerity.should_receive(:sleep)
+    Culerity.run_rails :port => 4000, :environment => 'culerity'
+  end
+end

data/spec/remote_browser_proxy_spec.rb

@@ -17,7 +17,7 @@ describe Culerity::RemoteBrowserProxy do
     proxy.goto.should == :okay
   end
   
-  it "should send the brower options to the remote server" do
+  it "should send the browser options to the remote server" do
     io = stub 'io', :gets => "[:return, \"browser0\"]"
     io.should_receive(:<<).with('["celerity", "new_browser", {:browser=>:firefox}]' + "\n")
     proxy = Culerity::RemoteBrowserProxy.new io, {:browser => :firefox}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: culerity
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Alexander Lang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-08 00:00:00 +02:00
+date: 2009-11-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,11 +39,11 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
+- README.md
 files: 
 - .gitignore
 - MIT-LICENSE
-- README.textile
+- README.md
 - Rakefile
 - VERSION.yml
 - culerity.gemspec
@@ -66,12 +66,13 @@ files:
 - rails_generators/culerity/culerity_generator.rb
 - rails_generators/culerity/templates/config/environments/culerity_continuousintegration.rb
 - rails_generators/culerity/templates/config/environments/culerity_development.rb
-- rails_generators/culerity/templates/features/step_definitions/common_celerity_steps.rb
+- rails_generators/culerity/templates/features/step_definitions/culerity_steps.rb
 - rails_generators/culerity/templates/lib/tasks/culerity.rake
 - script/console
 - script/destroy
 - script/generate
 - spec/celerity_server_spec.rb
+- spec/culerity_spec.rb
 - spec/remote_browser_proxy_spec.rb
 - spec/remote_object_proxy_spec.rb
 - spec/spec_helper.rb
@@ -105,6 +106,7 @@ specification_version: 3
 summary: Culerity integrates Cucumber and Celerity in order to test your application's full stack.
 test_files: 
 - spec/celerity_server_spec.rb
+- spec/culerity_spec.rb
 - spec/remote_browser_proxy_spec.rb
 - spec/remote_object_proxy_spec.rb
 - spec/spec_helper.rb

data/rails_generators/culerity/templates/features/step_definitions/common_celerity_steps.rb

@@ -1,93 +0,0 @@
-require 'culerity'
-
-Before do
-  unless $rails_server
-    $rails_server = Culerity::run_rails
-    sleep 5
-  end
-  
-  $server ||= Culerity::run_server
-  $browser = Culerity::RemoteBrowserProxy.new $server, {:browser => :firefox}
-  @host = 'http://localhost:3001'
-end
-
-at_exit do
-  $browser.exit if $browser
-  $server.exit_server if $server
-  Process.kill(6, $rails_server.pid.to_i) if $rails_server
-end
-
-When /I press "(.*)"/ do |button|
-  $browser.button(:text, button).click
-  assert_successful_response
-end
-
-When /I follow "(.*)"/ do |link|
-  $browser.link(:text, /#{link}/).click
-  assert_successful_response
-end
-
-When /I fill in "(.*)" for "(.*)"/ do |value, field|
-  $browser.text_field(:id, find_label(field).for).set(value)
-end
-
-When /I check "(.*)"/ do |field|
-  $browser.check_box(:id, find_label(field).for).set(true)
-end
-
-When /^I uncheck "(.*)"$/ do |field|
-  $browser.check_box(:id, find_label(field).for).set(false)
-end
-
-When /I select "(.*)" from "(.*)"/ do |value, field|
-  $browser.select_list(:id, find_label(field).for).select value
-end
-
-When /I choose "(.*)"/ do |field|
-  $browser.radio(:id, find_label(field).for).set(true)
-end
-
-When /I go to (.+)/ do |path|
-  $browser.goto @host + path_to(path)
-  assert_successful_response
-end
-
-When /I wait for the AJAX call to finish/ do
-  $browser.wait
-end
-
-Then /I should see "(.*)"/ do |text|
-  # if we simply check for the browser.html content we don't find content that has been added dynamically, e.g. after an ajax call
-  div = $browser.div(:text, /#{text}/)
-  begin
-    div.html
-  rescue
-    #puts $browser.html
-    raise("div with '#{text}' not found")
-  end
-end
-
-Then /I should not see "(.*)"/ do |text|
-  div = $browser.div(:text, /#{text}/).html rescue nil
-  div.should be_nil
-end
-
-def find_label(text)
-  $browser.label :text, text
-end
-
-def assert_successful_response
-  status = $browser.page.web_response.status_code
-  if(status == 302 || status == 301)
-    location = $browser.page.web_response.get_response_header_value('Location')
-    puts "Being redirected to #{location}"
-    $browser.goto location
-    assert_successful_response
-  elsif status != 200
-    tmp = Tempfile.new 'culerity_results'
-    tmp << $browser.html
-    tmp.close
-    `open -a /Applications/Safari.app #{tmp.path}`
-    raise "Brower returned Response Code #{$browser.page.web_response.status_code}"
-  end
-end