.gitignore testing/application.rb testing/dispatcher.rb testing/integration_dsl_controller.rb testing/plugit_descriptor.rb @@ -1,52 +1,10 @@ -require 'rubygems' -gem 'rake' -require 'rake' -require 'rake/rdoctask' - -require "#{File.dirname(__FILE__)}/spec/environment" - -desc "Run all specs" -task :spec => ["spec:libs:checkout"] do - require "#{RSPEC_ROOT}/lib/spec/rake/spectask" - Spec::Rake::SpecTask.new :spec do |t| - t.spec_opts = ['--options', "\"#{SPEC_ROOT}/spec.opts\""] - t.spec_files = FileList["#{SPEC_ROOT}/**/*_spec.rb"] - end -end - -namespace :spec do - namespace :libs do - desc "Prepare workspace for running our specs" - task :checkout do - mkdir_p SUPPORT_LIB - libs = { - RSPEC_ROOT => "http://rspec.rubyforge.org/svn/trunk/rspec", - RSPEC_ON_RAILS_ROOT => "http://rspec.rubyforge.org/svn/trunk/rspec_on_rails", - ACTIONPACK_ROOT => "http://svn.rubyonrails.org/rails/trunk/actionpack/", - ACTIVESUPPORT_ROOT => "http://svn.rubyonrails.org/rails/trunk/activesupport/" - } - needed = libs.keys.select { |dir| not File.directory?(dir) } - if needed.empty? - puts "Support libraries are in place. Skipping checkout." - else - needed.each { |root| system "svn export #{libs[root]} #{root}" } - end - end - - desc "Remove libs from tmp directory" - task :clean do - rm_rf SUPPORT_LIB - puts "cleaned #{SUPPORT_LIB}" - end - end -end +require File.expand_path(File.dirname(__FILE__) + '/testing/plugit_descriptor') +require 'rake/rdoctask' Rake::RDocTask.new(:doc) do |r| r.title = "Rails Scenarios Plugin" r.main = "README" r.options << "--line-numbers" r.rdoc_files.include("README", "LICENSE", "lib/**/*.rb") r.rdoc_dir = "doc" -end - -task :default => :spec \ No newline at end of file +end \ No newline at end of file Rakefile @@ -1,5 +1,4 @@ require File.dirname(__FILE__) + '/../spec_helper' -require 'integration_dsl_controller' describe "submit_form", :type => :controller do include Spec::Integration::DSL spec/dsl/form_spec.rb @@ -2,9 +2,14 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "An integration spec", :type => :integration do it "should provide all the normal integration support" do - get "/" - response.should_not be_nil - open_session.should_not == @integration_session + with_routing do |set| + set.draw do |map| + map.root :controller => 'integration_dsl' + get "/" + response.should_not be_nil + open_session.should_not == @integration_session + end + end with_routing do |set| set.draw do |map| spec/dsl/integration_spec_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' -require 'integration_dsl_controller' -describe Spec::Integration::DSL, "find_anchor", :type => :controller do +describe "find_anchor", :type => :controller do + include Spec::Integration::DSL controller_name :integration_dsl before do @@ -19,7 +19,8 @@ describe Spec::Integration::DSL, "find_anchor", :type => :controller do end end -describe Spec::Integration::DSL, "have_navigated_successfully", :type => :controller do +describe "have_navigated_successfully", :type => :controller do + include Spec::Integration::DSL controller_name :integration_dsl it "should report the exception in the failure message" do spec/dsl/navigation_spec.rb @@ -1,29 +1,8 @@ -require File.dirname(__FILE__) + "/../spec/environment" +require File.expand_path(File.dirname(__FILE__) + "/../testing/plugit_descriptor") -unless defined? DATABASE_ADAPTER - $: << "#{SPEC_ROOT}" - $: << "#{PLUGIN_ROOT}/lib" - $: << "#{RSPEC_ROOT}/lib" - $: << "#{ACTIONPACK_ROOT}/lib" - $: << "#{ACTIVERECORD_ROOT}/lib" - $: << "#{ACTIVESUPPORT_ROOT}/lib" - $: << "#{RSPEC_ON_RAILS_ROOT}/lib" +def fail_with(message) + raise_error(Spec::Expectations::ExpectationNotMetError, message) +end - require 'active_support' - require 'active_record' - require 'action_controller' - require 'action_view' - - require 'spec' - require 'spec/rails' - require 'spec/integration' - - def fail_with(message) - raise_error(Spec::Expectations::ExpectationNotMetError, message) - end - - require 'logger' - RAILS_DEFAULT_LOGGER = Logger.new("#{SUPPORT_TEMP}/test.log") - RAILS_DEFAULT_LOGGER.level = Logger::DEBUG - ActiveRecord::Base.logger = RAILS_DEFAULT_LOGGER -end \ No newline at end of file +require 'spec/integration' +require 'integration_dsl_controller' \ No newline at end of file spec/spec_helper.rb spec/application.rb spec/dispatcher.rb spec/environment.rb spec/integration_dsl_controller.rb 63791a4c1b62e58d67c07bff7215472ae92cbb24 Adam Williams adam@thewilliams.ws http://github.com/aiwilliams/spec_integration/commit/3417791e6900e731fca04f1b451b7dd7e0b2706e 3417791e6900e731fca04f1b451b7dd7e0b2706e 2008-06-19T12:44:42-07:00 2008-06-19T12:44:42-07:00 Updated to use plugit gem. Running against rails/rspec edge. f704a0b2afcf0032c278b652d0fe8302f5645497 Adam Williams adam@thewilliams.ws