fletcherm-culerity 0.2.7 → 0.2.8

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.2.8
+
+* removed separate development and continuous integration environments and replaced them with a single one (thilo)
+* more webrat like step definitions (lupine)
+* improve on stability issues (mattmatt)
+
 ## 0.2.7
 
 * fixed RemoteBrowser#confirm called celerity remove_listener with invalid arguments
@@ -11,4 +17,4 @@
 
 ## Before that
 
-Lots of important contributions from a bunch of people. check the commit logs.
+Lots of important contributions from a bunch of people. check the commit logs.

data/README.md

@@ -33,7 +33,7 @@ After you have written a first feature you can run it just like you would run a
     rake culerity:rails:start
     cucumber features/my_feature.feature
 
-The Rails instance uses a special environment culerity_development.
+The Rails instance uses a special environment culerity.
 
 When you have finished running culerity/cucumber you can turn off the Rails instance:
 
@@ -61,7 +61,7 @@ My database is not cleared automatically between scenarios
 
     Before do
       [User, .... all your models].each do |model|
-        mode.delete_all
+        model.delete_all
       end
     end
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
-:patch: 7
+:patch: 8
 :major: 0
 :minor: 2

data/features/installing_culerity.feature

@@ -22,8 +22,7 @@ Feature: Installing culerity
 
   Scenario: Install culerity into a Rails app and check it works
     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
+    Then file "config/environments/culerity.rb" is created
 
     When I run executable "cucumber" with arguments "features/"
     Then I should see "0 scenarios"

data/features/support/env.rb

@@ -17,7 +17,6 @@ end
 require 'rubigen'
 require 'rubigen/helpers/generator_test_helper'
 include RubiGen::GeneratorTestHelper
-require 'rails_generator'
 
 SOURCES = Dir[File.dirname(__FILE__) + "/../../generators"].map do |f|
   RubiGen::PathSource.new(:test, File.expand_path(f))

data/fletcherm-culerity.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fletcherm-culerity}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Lang", "Matt Fletcher"]
-  s.date = %q{2010-02-02}
+  s.date = %q{2010-02-17}
   s.description = %q{Culerity integrates Cucumber and Celerity in order to test your application's full stack.}
   s.email = %q{fletcher@atomicobject.com}
   s.extra_rdoc_files = [
@@ -41,10 +41,11 @@ Gem::Specification.new do |s|
      "lib/culerity/persistent_delivery.rb",
      "lib/culerity/remote_browser_proxy.rb",
      "lib/culerity/remote_object_proxy.rb",
+     "lib/tasks/rspec.rake",
      "rails/init.rb",
      "rails_generators/culerity/culerity_generator.rb",
+     "rails_generators/culerity/templates/config/environments/culerity.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/culerity_steps.rb",
      "rails_generators/culerity/templates/features/support/env.rb",
      "rails_generators/culerity/templates/lib/tasks/culerity.rake",

data/lib/culerity.rb

@@ -29,8 +29,15 @@ module Culerity
     if defined?(Rails) && !File.exists?("tmp/culerity_rails_server.pid")
       puts "WARNING: Speed up execution by running 'rake culerity:rails:start'"
       port        = options[:port] || 3001
-      environment = options[:environment] || 'culerity_development'
-      rails_server = IO.popen("script/server -e #{environment} -p #{port}", 'r+')
+      environment = options[:environment] || 'culerity'
+      rails_server = fork do
+        $stdin.reopen "/dev/null"
+        $stdout.reopen "/dev/null"
+        $stderr.reopen "/dev/null"
+        Dir.chdir(Rails.root) do
+          exec "script/server -e #{environment} -p #{port}"
+        end
+      end
       sleep 5
       rails_server
     end

data/lib/culerity/celerity_server.rb

@@ -41,6 +41,7 @@ module Culerity
     def close_browsers
       @browsers.each { |browser| browser.close }
       @browsers = []
+      @proxies = {}
     end
 
     def browser(number)

data/lib/culerity/jruby_runner.rb

@@ -3,7 +3,7 @@ module Culerity
     def self.cmd
       jruby_complete = "#{File.dirname(__FILE__)}/../../vendor/jruby/jruby-complete-1.4.0.jar"
       celerity = "#{File.dirname(__FILE__)}/../../vendor/gems/celerity-0.7.6/lib"
-      "java -Xmx2048m -Xss1024k -jar #{jruby_complete} -I#{celerity}"
+      "java -Xmx512m -Xss1024k -jar #{jruby_complete} -I#{celerity}"
     end
 
     def self.run(command_to_run)

data/lib/culerity/remote_browser_proxy.rb

@@ -1,9 +1,10 @@
 module Culerity
-
   class RemoteBrowserProxy < RemoteObjectProxy
     def initialize(io, browser_options = {})
       @io = io
-      @remote_object_id = "celerity".inspect
+      #sets the remote receiver to celerity for the new_browser message.
+      @remote_object_id = "celerity".inspect 
+      #celerity server will create a new browser which shall receive the remote calls from now on.
       @remote_object_id = new_browser(browser_options).inspect
     end
     

data/lib/culerity/remote_object_proxy.rb

@@ -3,7 +3,7 @@ module Culerity
   class CulerityException < StandardError
     def initialize(message, backtrace)
       super message
-      #self.backtrace = backtrace
+      set_backtrace(backtrace)      
     end
   end
 

data/lib/tasks/rspec.rake

@@ -0,0 +1,66 @@
+gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
+
+# Don't load rspec if running "rake gems:*"
+unless ARGV.any? {|a| a =~ /^gems/}
+
+begin
+  require 'spec/rake/spectask'
+rescue MissingSourceFile
+  module Spec
+    module Rake
+      class SpecTask
+        def initialize(name)
+          task name do
+            # if rspec-rails is a configured gem, this will output helpful material and exit ...
+            require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
+
+            # ... otherwise, do this:
+            raise <<-MSG
+
+#{"*" * 80}
+*  You are trying to run an rspec rake task defined in
+*  #{__FILE__},
+*  but rspec can not be found in vendor/gems, vendor/plugins or system gems.
+#{"*" * 80}
+MSG
+          end
+        end
+      end
+    end
+  end
+end
+
+Rake.application.instance_variable_get('@tasks').delete('default')
+
+spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
+task :noop do
+end
+
+task :default => [:spec,:features]
+task :stats => "spec:statsetup"
+
+desc "Run all specs in spec directory (excluding plugin specs)"
+Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
+  t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+  t.spec_files = FileList['spec/**/*/*_spec.rb']
+end
+
+desc "Run all specs in the spec directory with html output (excluding plugins specs)"
+Spec::Rake::SpecTask.new(:spec_html => spec_prereq) do |t|
+  t.spec_opts = ['--colour', '--format html', '--loadby mtime', '--reverse']
+  t.spec_files = FileList['spec/**/*/*_spec.rb']
+end
+
+namespace :spec do
+  desc "Run all specs in spec directory with RCov (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/**/*/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = lambda do
+      IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+    end
+  end
+end
+
+end

data/rails_generators/culerity/culerity_generator.rb

@@ -5,13 +5,11 @@ class CulerityGenerator < Rails::Generator::Base
       m.directory 'features/step_definitions'
       m.file 'features/step_definitions/culerity_steps.rb', 'features/step_definitions/culerity_steps.rb'
       m.file 'features/support/env.rb', 'features/support/env.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'
+      m.file 'config/environments/culerity.rb', 'config/environments/culerity.rb'
 
       m.gsub_file 'config/database.yml', /cucumber:.*\n/, "cucumber: &CUCUMBER\n"
 
-      m.gsub_file 'config/database.yml', /\z/, "\nculerity_development:\n  <<: *CUCUMBER"
-      m.gsub_file 'config/database.yml', /\z/, "\nculerity_continuousintegration:\n  <<: *CUCUMBER"
+      m.gsub_file 'config/database.yml', /\z/, "\nculerity:\n  <<: *CUCUMBER"
       
       m.file "lib/tasks/culerity.rake", "lib/tasks/culerity.rake"
       

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

@@ -1,7 +1,7 @@
 require 'culerity'
 
 Before do
-  $rails_server ||= Culerity::run_rails(:environment => 'culerity_development', :port => 3001)
+  $rails_server ||= Culerity::run_rails(:environment => 'culerity', :port => 3001)
   $server ||= Culerity::run_server
   $browser = Culerity::RemoteBrowserProxy.new $server, {:browser => :firefox3,
     :javascript_exceptions => true,
@@ -18,8 +18,17 @@ at_exit do
   Process.kill(6, $rails_server.pid.to_i) if $rails_server
 end
 
+Given /^(?:|I )am on (.+)$/ do |page_name|
+  $browser.goto @host + path_to(page_name)
+end
+
 When /I follow "([^\"]*)"/ do |link|
-  _link = [[:text, /^#{Regexp.escape(link)}$/], [:id, link], [:title, link]].map{|args| $browser.link(*args)}.find{|__link| __link.exist?}
+  _link = [
+    [:text, /^#{Regexp.escape(link)}$/ ], 
+    [:id, link], 
+    [:title, link],
+    [:text, /#{Regexp.escape(link)}/ ], 
+  ].map{|args| $browser.link(*args)}.find{|__link| __link.exist?}
   raise "link \"#{link}\" not found" unless _link
   _link.click
   assert_successful_response
@@ -43,7 +52,7 @@ When /I check "([^\"]*)"/ do |field|
 end
 
 When /^I uncheck "([^\"]*)"$/ do |field|
-  find_by_label_or_id(:check_box, field).set(true)
+  find_by_label_or_id(:check_box, field).set(false)
 end
 
 When /I select "([^\"]*)" from "([^\"]*)"/ do |value, field|
@@ -74,14 +83,69 @@ When /^I wait for the AJAX call to finish$/ do
   end
 end
 
+Then /^(?:|I )should be on (.+)$/ do |page_name|
+  current_path = URI.parse($browser.url)
+  expected_path = URI.parse(path_to(page_name))
+
+  # If our expected path doesn't specify a query-string, ignore any query string
+  # in the current path 
+  current_path, expected_path = if expected_path.query.nil? 
+    [ current_path.path, expected_path.path ]
+  else
+    [ current_path.select(:path, :query).compact.join('?'), path_to(page_name) ]
+  end
+
+  if defined?(Spec::Rails::Matchers)
+    current_path.should == path_to(page_name)
+  else
+    assert_equal path_to(page_name), current_path
+  end
+end
+
+Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
+  f = find_by_label_or_id(:text_field, field)
+  if defined?(Spec::Rails::Matchers)
+    f.text.should =~ /#{Regexp::escape(value)}/
+  else
+    assert_match(/#{Regexp::escape(value)}/, f.text)
+  end
+end
+
+Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
+  f = find_by_label_or_id(:text_field, field)
+  if defined?(Spec::Rails::Matchers)
+    f.text.should_not =~ /#{Regexp::escape(value)}/
+  else
+    assert_no_match(/#{Regexp::escape(value)}/, f.text)
+  end
+end
+
+Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
+  f = find_by_label_or_id(:check_box, label)
+  if defined?(Spec::Rails::Matchers)
+    f.should be_checked
+  else
+    assert f.checked?
+  end
+end
+
+Then /^the "([^\"]*)" checkbox should not be checked$/ do |label|
+  f = find_by_label_or_id(:check_box, label)
+  if defined?(Spec::Rails::Matchers)
+   f.should_not be_checked
+  else
+    assert !f.checked?
+  end
+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 = $browser.div(:text, /#{Regexp::escape(text)}/)
   div.should be_exist
 end
 
 Then /I should not see "([^\"]*)"/ do |text|
-  div = $browser.div(:text, /#{text}/)
+  div = $browser.div(:text, /#{Regexp::escape(text)}/)
   div.should_not be_exist
 end
 

data/rails_generators/culerity/templates/features/support/env.rb

@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] ||= "culerity_development"
+ENV["RAILS_ENV"] ||= "culerity"
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 require 'cucumber/rails/world'
 

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

@@ -3,7 +3,7 @@ namespace 'culerity' do
     desc "Starts a rails server for cucumber/culerity tests"
     task :start do
       port = ENV['PORT'] || 3001
-      environment = ENV["RAILS_ENV"] || 'culerity_development'
+      environment = ENV["RAILS_ENV"] || 'culerity'
       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"

data/spec/culerity_spec.rb

@@ -4,30 +4,44 @@ describe Culerity, 'run_rails' do
   before(:each) do
     Kernel.stub!(:sleep)
     IO.stub!(:popen)
+    Culerity.stub!(:fork).and_yield.and_return(3200)
+    Culerity.stub!(:exec)
     Culerity.stub!(:sleep)
+    [$stdin, $stdout, $stderr].each{|io| io.stub(:reopen)}
   end
   
   it "should not run rails if we are not using rails" do
-    IO.should_not_receive(:popen)
+    Culerity.should_not_receive(:exec)
     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+')
+    Rails ||= stub(:rails, :root => Dir.pwd)
+    Culerity.should_receive(:exec).with("script/server -e culerity -p 3001")
     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+')
+    Rails ||= stub(:rails, :root => Dir.pwd)
+    Culerity.should_receive(:exec).with("script/server -e culerity -p 4000")
+    Culerity.run_rails :port => 4000, :environment => 'culerity'
+  end
+
+  it "should change into the rails root directory" do
+    Rails ||= stub(:rails, :root => Dir.pwd)
+    Dir.should_receive(:chdir).with(Dir.pwd)
     Culerity.run_rails :port => 4000, :environment => 'culerity'
-    
   end
   
   it "should wait for the server to start up" do
-    Rails ||= :rails
+    Rails ||= stub(:rails, :root => Dir.pwd)
     Culerity.should_receive(:sleep)
     Culerity.run_rails :port => 4000, :environment => 'culerity'
   end
+  
+  it "should reopen the i/o channels to /dev/null" do
+    Rails ||= stub(:rails, :root => Dir.pwd)
+    [$stdin, $stdout, $stderr].each{|io| io.should_receive(:reopen).with("/dev/null")}
+    Culerity.run_rails :port => 4000, :environment => 'culerity'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fletcherm-culerity
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Alexander Lang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 -05:00
+date: 2010-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,10 +67,11 @@ files:
 - lib/culerity/persistent_delivery.rb
 - lib/culerity/remote_browser_proxy.rb
 - lib/culerity/remote_object_proxy.rb
+- lib/tasks/rspec.rake
 - rails/init.rb
 - rails_generators/culerity/culerity_generator.rb
+- rails_generators/culerity/templates/config/environments/culerity.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/culerity_steps.rb
 - rails_generators/culerity/templates/features/support/env.rb
 - rails_generators/culerity/templates/lib/tasks/culerity.rake