culerity 0.2.4 → 0.2.5

data/features/installing_culerity.feature

@@ -5,42 +5,32 @@ Feature: Installing culerity
 
   Background:
     Given a Rails app
-    And I run executable "script/generate" with arguments "cucumber"
-    And I delete file "features/step_definitions/webrat_steps.rb"
-    And I copy the project generators into "vendor/generators"
-    And I invoke task "rake db:migrate"
+      And I run executable "script/generate" with arguments "cucumber"
+      And I delete file "features/step_definitions/webrat_steps.rb"
+      And I delete file "features/support/env.rb"
+      And I copy the project generators into "vendor/generators"
+      And I invoke task "rake db:migrate"
     When I run executable "script/generate" with arguments "culerity"
-    And I setup load path to local code
+      And I setup load path to local code
+      And I setup the culerity javascript helpers
   
-  Scenario: Install culerity and setup jruby environment
-    Given I have jruby installed
-    When I invoke task "rake culerity:install"
-    Then the gem "jarib-celerity" is installed into jruby environment
-
   Scenario: Install culerity and test the rails start + stop tasks
     When I invoke task "rake culerity:rails:start"
     Then file "tmp/culerity_rails_server.pid" is created
-    And I invoke task "rake culerity:rails:stop"
+      And I invoke task "rake culerity:rails:stop"
     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/culerity_steps.rb" is created
     Then file "config/environments/culerity_development.rb" is created
     Then file "config/environments/culerity_continuousintegration.rb" is created
-    
-    And I run executable "cucumber" with arguments "features/"
+
+    When I run executable "cucumber" with arguments "features/"
     Then I should see "0 scenarios"
-    And I should see "0 steps"
-    
+      And I should see "0 steps"
     Given I invoke task "rake culerity:rails:start"
-    
     When I add a feature file to test Rails index.html default file
-    And I run executable "cucumber" with arguments "features/"
+      And I run executable "cucumber" with arguments "features/"
     Then I should see "1 scenario"
-    And I should see "5 steps (5 passed)"
-    And I should not see "WARNING: Speed up executing by running 'rake culerity:rails:start'"
-
-  
-  
-  
-  
+      And I should see "5 steps (5 passed)"
+      And I should not see "WARNING: Speed up executing by running 'rake culerity:rails:start'"

data/features/running_cucumber_without_explicitly_running_external_services.feature

@@ -5,20 +5,19 @@ Feature: Running cucumber without explicitly running external services
 
   Background:
     Given a Rails app
-    And I run executable "script/generate" with arguments "cucumber"
-    And I delete file "features/step_definitions/webrat_steps.rb"
-    And I copy the project generators into "vendor/generators"
-    And I invoke task "rake db:migrate"
+      And I run executable "script/generate" with arguments "cucumber"
+      And I delete file "features/step_definitions/webrat_steps.rb"
+      And I delete file "features/support/env.rb"
+      And I copy the project generators into "vendor/generators"
+      And I invoke task "rake db:migrate"
     When I run executable "script/generate" with arguments "culerity"
-    And I setup load path to local code
+      And I setup load path to local code
+      And I setup the culerity javascript helpers
   
   Scenario: Successfully run scenarios without requiring celerity or rails processes running
     When I add a feature file to test Rails index.html default file
-    And I run executable "cucumber" with arguments "features/"
+      And I run executable "cucumber" with arguments "features/"
     Then file "tmp/culerity_rails_server.pid" is not created
-    And I should see "1 scenario"
-    And I should see "5 steps (5 passed)"
-    And I should see "WARNING: Speed up execution by running 'rake culerity:rails:start'"
-  
-  
-  
+      And I should see "1 scenario"
+      And I should see "5 steps (5 passed)"
+      And I should see "WARNING: Speed up execution by running 'rake culerity:rails:start'"

data/features/step_definitions/rails_setup_steps.rb

@@ -19,6 +19,16 @@ When /^I add a feature file to test Rails index.html default file$/ do
   end
 end
 
+When /^I setup the culerity javascript helpers$/ do
+  `cp #{File.dirname(__FILE__) + "/../fixtures/jquery"} #{File.join(@active_project_folder, 'public', 'javascripts', 'jquery.js')}`
+  in_project_folder do
+    _index = File.read('public/index.html')
+    File.open('public/index.html', 'w') do |f|
+      f << _index.sub('</head>', '<script type="text/javascript" src="javascripts/jquery.js"></script><script type="text/javascript" src="javascripts/culerity.js"></script><script type="text/javascript">jQuery.noConflict();</script></head>')
+    end
+  end
+end
+
 After do
   in_project_folder do
     Given 'I invoke task "rake culerity:rails:stop"'

data/rails_generators/culerity/culerity_generator.rb

@@ -4,6 +4,7 @@ class CulerityGenerator < Rails::Generator::Base
     record do |m|
       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'
 
@@ -13,6 +14,8 @@ class CulerityGenerator < Rails::Generator::Base
       m.gsub_file 'config/database.yml', /\z/, "\nculerity_continuousintegration:\n  <<: *CUCUMBER"
       
       m.file "lib/tasks/culerity.rake", "lib/tasks/culerity.rake"
+      
+      m.file 'public/javascripts/culerity.js', 'public/javascripts/culerity.js'
     end
   end
 

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', :port => 3001)
+  $rails_server ||= Culerity::run_rails(:environment => 'culerity_development', :port => 3001)
   $server ||= Culerity::run_server
   $browser = Culerity::RemoteBrowserProxy.new $server, {:browser => :firefox3,
     :javascript_exceptions => true,
@@ -18,40 +18,39 @@ at_exit do
   Process.kill(6, $rails_server.pid.to_i) if $rails_server
 end
 
-When /I follow "(.*)"/ do |link|
+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|
+When /I press "([^\"]*)"/ do |button|
   $browser.button(:text, button).click
   assert_successful_response
 end
 
-When /I fill in "(.*)" with "(.*)"/ do |field, value|
+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|
+When /I fill in "([^\"]*)" for "([^\"]*)"/ do |value, field|
   find_by_label_or_id(:text_field, field).set(value)
 end
 
-When /I check "(.*)"/ do |field|
+When /I check "([^\"]*)"/ do |field|
   find_by_label_or_id(:check_box, field).set(true)
 end
 
-When /^I uncheck "(.*)"$/ do |field|
+When /^I uncheck "([^\"]*)"$/ do |field|
   find_by_label_or_id(:check_box, field).set(true)
 end
 
-When /I select "(.*)" from "(.*)"/ do |value, field|
+When /I select "([^\"]*)" from "([^\"]*)"/ do |value, field|
   find_by_label_or_id(:select_list, field).select value
 end
 
-When /I choose "(.*)"/ do |field|
+When /I choose "([^\"]*)"/ do |field|
   find_by_label_or_id(:radio, field).set(true)
 end
 
@@ -60,17 +59,28 @@ When /I go to (.+)/ do |path|
   assert_successful_response
 end
 
-When /I wait for the AJAX call to finish/ do
-  $browser.wait
+When /^I wait for the AJAX call to finish$/ do
+  $browser.wait_while do
+    begin
+      count = $browser.execute_script("window.running_ajax_calls").to_i
+      count.to_i > 0
+    rescue => e
+      if e.message.include?('HtmlunitCorejsJavascript::Undefined')
+        raise "For 'I wait for the AJAX call to finish' to work please include culerity.js after including jQuery. If you don't use jQuery please rewrite culerity.js accordingly."
+      else
+        raise(e)
+      end
+    end
+  end
 end
 
-Then /I should see "(.*)"/ do |text|
+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|
+Then /I should not see "([^\"]*)"/ do |text|
   div = $browser.div(:text, /#{text}/)
   div.should_not be_exist
 end

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

@@ -0,0 +1,9 @@
+ENV["RAILS_ENV"] ||= "culerity_development"
+require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+require 'cucumber/rails/world'
+
+Cucumber::Rails::World.use_transactional_fixtures = false
+ActionController::Base.allow_rescue = false
+
+require 'cucumber/formatter/unicode'
+require 'cucumber/rails/rspec'

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

@@ -33,6 +33,6 @@ namespace 'culerity' 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"
+    sh "#{jgem_cmd} -S gem install celerity"
   end
 end

data/rails_generators/culerity/templates/public/javascripts/culerity.js

@@ -0,0 +1,27 @@
+// this allows culerity to wait until all ajax requests have finished
+jQuery(function($) {
+	var original_ajax = $.ajax;
+	var count_down = function(callback) {
+		return function() {
+			try {
+				if(callback) {
+					callback.apply(this, arguments);
+				};
+			} catch(e) {
+				window.running_ajax_calls -= 1;
+				throw(e);
+			}
+			window.running_ajax_calls -= 1;
+		}
+	};
+	window.running_ajax_calls = 0;
+	
+	var ajax_with_count = function(options) {
+		window.running_ajax_calls += 1;
+		options.success = count_down(options.success);
+		options.error = count_down(options.error);
+		original_ajax(options);
+	};
+
+	$.ajax = ajax_with_count;
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: culerity
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Alexander Lang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-22 00:00:00 +01:00
+date: 2009-11-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,11 +42,13 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- CHANGES.md
 - MIT-LICENSE
 - README.md
 - Rakefile
 - VERSION.yml
 - culerity.gemspec
+- features/fixtures/jquery
 - features/fixtures/sample_feature
 - features/installing_culerity.feature
 - features/running_cucumber_without_explicitly_running_external_services.feature
@@ -67,7 +69,9 @@ files:
 - 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
+- rails_generators/culerity/templates/public/javascripts/culerity.js
 - script/console
 - script/destroy
 - script/generate