--- src/.rspec | 2 + src/autotest/discover.rb | 2 + src/features/support/env.rb | 6 +- src/features/support/paths.rb | 7 +- src/lib/tasks/cucumber.rake | 29 +--- src/lib/tasks/rspec.rake | 157 -------------------- src/spec/controllers/builds_controller_spec.rb | 2 + .../controllers/cloud_accounts_controller_spec.rb | 1 + src/spec/controllers/dashboard_controller_spec.rb | 1 + .../hardware_profiles_controller_spec.rb | 1 + src/spec/controllers/instance_controller_spec.rb | 2 + src/spec/controllers/pools_controller_spec.rb | 12 ++- src/spec/controllers/provider_controller_spec.rb | 1 + src/spec/controllers/templates_controller_spec.rb | 1 + .../controllers/user_sessions_controller_spec.rb | 4 +- src/spec/controllers/users_controller_spec.rb | 2 + src/spec/models/cloud_account_spec.rb | 8 +- src/spec/models/hardware_profile_spec.rb | 4 +- src/spec/models/provider_spec.rb | 9 +- src/spec/models/template_spec.rb | 4 +- src/spec/models/user_spec.rb | 8 +- .../services/data_service_active_record_spec.rb | 6 +- src/spec/services/registration_service_spec.rb | 3 +- src/spec/spec.opts | 4 - src/spec/spec_helper.rb | 68 +++------ 25 files changed, 81 insertions(+), 263 deletions(-) create mode 100644 src/.rspec create mode 100644 src/autotest/discover.rb delete mode 100644 src/lib/tasks/rspec.rake delete mode 100644 src/spec/spec.opts
diff --git a/src/.rspec b/src/.rspec new file mode 100644 index 0000000..89da67b --- /dev/null +++ b/src/.rspec @@ -0,0 +1,2 @@ +--colour +--format progress diff --git a/src/autotest/discover.rb b/src/autotest/discover.rb new file mode 100644 index 0000000..f421dc5 --- /dev/null +++ b/src/autotest/discover.rb @@ -0,0 +1,2 @@ +Autotest.add_discovery { "rails" } +Autotest.add_discovery { "rspec2" } diff --git a/src/features/support/env.rb b/src/features/support/env.rb index b921613..43b9c85 100644 --- a/src/features/support/env.rb +++ b/src/features/support/env.rb @@ -4,11 +4,10 @@ # instead of editing this one. Cucumber will automatically load all features/**/*.rb # files.
-ENV["RAILS_ENV"] ||= "cucumber" +ENV["RAILS_ENV"] ||= "test" require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support -require 'cucumber/rails/rspec' require 'cucumber/rails/world' require 'cucumber/rails/active_record' require 'cucumber/web/tableish' @@ -17,11 +16,10 @@ require 'webrat' require 'webrat/core/matchers'
Webrat.configure do |config| - config.mode = :rails + config.mode = :rack config.open_error_files = false # Set to true if you want error pages to pop up in the browser end
- # If you set this to false, any error raised from within your app will bubble # up to your step definition and out to cucumber unless you catch it somewhere # on the way. You can make Rails rescue errors and render error pages on a diff --git a/src/features/support/paths.rb b/src/features/support/paths.rb index d55f1f3..5d3504d 100644 --- a/src/features/support/paths.rb +++ b/src/features/support/paths.rb @@ -24,7 +24,7 @@ module NavigationHelpers account_path
when /the login error page/ - user_session_path + url_for :controller => 'user_sessions', :action => 'new', :only_path => true
when /the providers page/ url_for :controller => 'providers', :action => 'index', :only_path => true @@ -51,10 +51,10 @@ module NavigationHelpers pool_realms_path
when /the dashboard page/ - dashboard_path + url_for :controller => 'dashboard', :only_path => true
when /the instances page/ - instance_path + instances_path
when /the pool hardware profiles page/ hardware_profiles_pool_path @@ -86,6 +86,7 @@ module NavigationHelpers when /the settings update page/ url_for :action => 'update', :controller => 'settings', :only_path => true
+ # Add more mappings here. # Here is an example that pulls values out of the Regexp: # diff --git a/src/lib/tasks/cucumber.rake b/src/lib/tasks/cucumber.rake index 15034cd..982054e 100644 --- a/src/lib/tasks/cucumber.rake +++ b/src/lib/tasks/cucumber.rake @@ -43,28 +43,11 @@ begin task :features => :cucumber do STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***" end - - namespace :hudson do - def report_path - "hudson/reports/features/" - end - - Cucumber::Rake::Task.new({'cucumber' => [:report_setup]}) do |t| - t.cucumber_opts = %{--profile default --format junit --out #{report_path}} - end - - task :report_setup do - rm_rf report_path - mkdir_p report_path - end - - end - - rescue LoadError - desc 'cucumber rake task not available (cucumber not installed)' - task :cucumber do - abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin' - end +rescue LoadError + desc 'cucumber rake task not available (cucumber not installed)' + task :cucumber do + abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin' end +end
-end \ No newline at end of file +end diff --git a/src/lib/tasks/rspec.rake b/src/lib/tasks/rspec.rake deleted file mode 100644 index 80d000d..0000000 --- a/src/lib/tasks/rspec.rake +++ /dev/null @@ -1,157 +0,0 @@ -gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9 - -rspec_gem_dir = nil -Dir["#{RAILS_ROOT}/vendor/gems/*"].each do |subdir| - rspec_gem_dir = subdir if subdir.gsub("#{RAILS_ROOT}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb") -end -rspec_plugin_dir = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec') - -if rspec_gem_dir && (test ?d, rspec_plugin_dir) - raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n" -end - -if rspec_gem_dir - $LOAD_PATH.unshift("#{rspec_gem_dir}/lib") -elsif File.exist?(rspec_plugin_dir) - $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib") -end - -# 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.join(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 -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 - -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 - - desc "Prepare JUnit output rspec for Hudson" - task :pre_junit do - gem 'ci_reporter' - require 'ci/reporter/rake/rspec' - ENV["CI_REPORTS"] = 'hudson/reports/spec/' - end - - desc "Run JUnit output filter for spec" - task :junit => [:pre_junit, "ci:setup:rspec", "spec"] - - desc "Print Specdoc for all specs (excluding plugin specs)" - Spec::Rake::SpecTask.new(:doc) do |t| - t.spec_opts = ["--format", "specdoc", "--dry-run"] - t.spec_files = FileList['spec/**/*_spec.rb'] - end - - desc "Print Specdoc for all plugin examples" - Spec::Rake::SpecTask.new(:plugin_doc) do |t| - t.spec_opts = ["--format", "specdoc", "--dry-run"] - t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*') - end - - [:models, :controllers, :views, :helpers, :lib, :integration].each do |sub| - desc "Run the code examples in spec/#{sub}" - Spec::Rake::SpecTask.new(sub => spec_prereq) do |t| - t.spec_opts = ['--options', ""#{RAILS_ROOT}/spec/spec.opts""] - t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"] - end - end - - desc "Run the code examples in vendor/plugins (except RSpec's own)" - Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t| - t.spec_opts = ['--options', ""#{RAILS_ROOT}/spec/spec.opts""] - t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*") - end - - namespace :plugins do - desc "Runs the examples for rspec_on_rails" - Spec::Rake::SpecTask.new(:rspec_on_rails) do |t| - t.spec_opts = ['--options', ""#{RAILS_ROOT}/spec/spec.opts""] - t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*_spec.rb'] - end - end - - # Setup specs for stats - task :statsetup do - require 'code_statistics' - ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models') - ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views') - ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers') - ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers') - ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib') - ::STATS_DIRECTORIES << %w(Routing\ specs spec/routing) if File.exist?('spec/routing') - ::STATS_DIRECTORIES << %w(Integration\ specs spec/integration) if File.exist?('spec/integration') - ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models') - ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views') - ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers') - ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers') - ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib') - ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing') - ::CodeStatistics::TEST_TYPES << "Integration specs" if File.exist?('spec/integration') - end - - namespace :db do - namespace :fixtures do - desc "Load fixtures (from spec/fixtures) into the current environment's database. Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z." - task :load => :environment do - ActiveRecord::Base.establish_connection(Rails.env) - base_dir = File.join(Rails.root, 'spec', 'fixtures') - fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir - - require 'active_record/fixtures' - (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file| - Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*')) - end - end - end - end -end - -end - - diff --git a/src/spec/controllers/builds_controller_spec.rb b/src/spec/controllers/builds_controller_spec.rb index ef4f3d4..4fb2ea4 100644 --- a/src/spec/controllers/builds_controller_spec.rb +++ b/src/spec/controllers/builds_controller_spec.rb @@ -1,6 +1,8 @@ require 'spec_helper'
describe BuildsController do + include Authlogic::TestCase + fixtures :all before(:each) do @admin_permission = Factory :admin_permission diff --git a/src/spec/controllers/cloud_accounts_controller_spec.rb b/src/spec/controllers/cloud_accounts_controller_spec.rb index d61ad34..bd3b7e1 100644 --- a/src/spec/controllers/cloud_accounts_controller_spec.rb +++ b/src/spec/controllers/cloud_accounts_controller_spec.rb @@ -1,6 +1,7 @@ require 'spec_helper'
describe CloudAccountsController do + include Authlogic::TestCase
fixtures :all before(:each) do diff --git a/src/spec/controllers/dashboard_controller_spec.rb b/src/spec/controllers/dashboard_controller_spec.rb index bd327ce..dc2c2eb 100644 --- a/src/spec/controllers/dashboard_controller_spec.rb +++ b/src/spec/controllers/dashboard_controller_spec.rb @@ -1,6 +1,7 @@ require 'spec_helper'
describe DashboardController do + include Authlogic::TestCase
fixtures :all before(:each) do diff --git a/src/spec/controllers/hardware_profiles_controller_spec.rb b/src/spec/controllers/hardware_profiles_controller_spec.rb index 5d21841..c6b4fe8 100644 --- a/src/spec/controllers/hardware_profiles_controller_spec.rb +++ b/src/spec/controllers/hardware_profiles_controller_spec.rb @@ -1,6 +1,7 @@ require 'spec_helper'
describe HardwareProfilesController do + include Authlogic::TestCase
fixtures :all before(:each) do diff --git a/src/spec/controllers/instance_controller_spec.rb b/src/spec/controllers/instance_controller_spec.rb index 241c05b..f107489 100644 --- a/src/spec/controllers/instance_controller_spec.rb +++ b/src/spec/controllers/instance_controller_spec.rb @@ -1,6 +1,8 @@ require 'spec_helper'
describe InstancesController do + include Authlogic::TestCase + fixtures :all before(:each) do @admin_permission = Factory :admin_permission diff --git a/src/spec/controllers/pools_controller_spec.rb b/src/spec/controllers/pools_controller_spec.rb index c9fcc82..dabf38b 100644 --- a/src/spec/controllers/pools_controller_spec.rb +++ b/src/spec/controllers/pools_controller_spec.rb @@ -1,11 +1,21 @@ require 'spec_helper'
describe PoolsController do + include Authlogic::TestCase + fixtures :all before(:each) do @admin_permission = Factory :admin_permission @admin = @admin_permission.user activate_authlogic + + # since default zone is created in migrations + # and not in seed file, create here + unless Zone.default + dz = Zone.new(:name => "default", :description => "default zone") + dz.save! + @default_zone = MetadataObject.set("default_zone", dz) + end end
it "should provide ui to create new pool" do @@ -20,7 +30,7 @@ describe PoolsController do response.should_not be_success end
- it "should provider means to create new pool" do + it "should provide means to create new pool" do UserSession.create(@admin) lambda do post :create, :pool => { :name => 'foopool' } diff --git a/src/spec/controllers/provider_controller_spec.rb b/src/spec/controllers/provider_controller_spec.rb index 49a45a8..3fd3c4c 100644 --- a/src/spec/controllers/provider_controller_spec.rb +++ b/src/spec/controllers/provider_controller_spec.rb @@ -1,6 +1,7 @@ require 'spec_helper'
describe ProvidersController do + include Authlogic::TestCase
fixtures :all before(:each) do diff --git a/src/spec/controllers/templates_controller_spec.rb b/src/spec/controllers/templates_controller_spec.rb index 0ead1b0..ccabac4 100644 --- a/src/spec/controllers/templates_controller_spec.rb +++ b/src/spec/controllers/templates_controller_spec.rb @@ -1,6 +1,7 @@ require 'spec_helper'
describe TemplatesController do + include Authlogic::TestCase
fixtures :all before(:each) do diff --git a/src/spec/controllers/user_sessions_controller_spec.rb b/src/spec/controllers/user_sessions_controller_spec.rb index b890b2e..ce2c2c7 100644 --- a/src/spec/controllers/user_sessions_controller_spec.rb +++ b/src/spec/controllers/user_sessions_controller_spec.rb @@ -1,6 +1,8 @@ require 'spec_helper'
describe UserSessionsController do + include Authlogic::TestCase + fixtures :all before(:each) do @tuser = Factory :tuser @@ -8,7 +10,7 @@ describe UserSessionsController do end
it "should call new method" do - route_for(:controller => 'user_sessions', :action => 'new').should == 'login' + {:get => 'login'}.should route_to(:controller => 'user_sessions', :action => 'new') get :new @current_user.should == nil UserSession.find.should == nil diff --git a/src/spec/controllers/users_controller_spec.rb b/src/spec/controllers/users_controller_spec.rb index c1fad30..d3f4fee 100644 --- a/src/spec/controllers/users_controller_spec.rb +++ b/src/spec/controllers/users_controller_spec.rb @@ -1,7 +1,9 @@ require 'spec_helper'
describe UsersController do + include Authlogic::TestCase
+ fixtures :all before(:each) do unless BasePermissionObject.find_by_name(BasePermissionObject::GENERAL_PERMISSION_SCOPE) Factory(:base_permission_object) diff --git a/src/spec/models/cloud_account_spec.rb b/src/spec/models/cloud_account_spec.rb index fb04e40..6b4d38a 100644 --- a/src/spec/models/cloud_account_spec.rb +++ b/src/spec/models/cloud_account_spec.rb @@ -9,11 +9,11 @@ describe CloudAccount do it "should not be destroyable if it has instances" do @cloud_account.instances << Instance.new @cloud_account.destroyable?.should be_false - @cloud_account.destroy.should be_false + @cloud_account.destroy.should == []
@cloud_account.instances.clear @cloud_account.destroyable?.should be_true - @cloud_account.destroy.equal?(@cloud_account).should be_true + @cloud_account.destroy.should == [] @cloud_account.should be_frozen end
@@ -33,9 +33,9 @@ describe CloudAccount do end
it "should create an instance_key if provider is EC2" do - @client = mock('DeltaCloud', :null_object => true) + @client = mock('DeltaCloud').as_null_object @provider = Factory.build :ec2_provider - @key = mock('Key', :null_object => true) + @key = mock('Key').as_null_object @key.stub!(:pem).and_return("PEM") @key.stub!(:id).and_return("1_user") @client.stub!(:"feature?").and_return(true) diff --git a/src/spec/models/hardware_profile_spec.rb b/src/spec/models/hardware_profile_spec.rb index a3e75e7..6ded54d 100644 --- a/src/spec/models/hardware_profile_spec.rb +++ b/src/spec/models/hardware_profile_spec.rb @@ -61,7 +61,7 @@ describe HardwareProfile do
@hp.aggregator_hardware_profiles << @hp @hp.should have(1).error_on(:aggregator_hardware_profiles) - @hp.errors.on(:aggregator_hardware_profiles).should eql( + @hp.errors[:aggregator_hardware_profiles].first.should eql( "Aggregator profiles only allowed for provider profiles")
@hp.aggregator_hardware_profiles.clear @@ -73,7 +73,7 @@ describe HardwareProfile do
@hp.aggregator_hardware_profiles << @hp @hp.should have(1).error_on(:provider_hardware_profiles) - @hp.errors.on(:provider_hardware_profiles).should eql( + @hp.errors[:provider_hardware_profiles].first.should eql( "Provider profiles only allowed for aggregator profiles")
@hp.provider_hardware_profiles.clear diff --git a/src/spec/models/provider_spec.rb b/src/spec/models/provider_spec.rb index 1b86f92..543ccee 100644 --- a/src/spec/models/provider_spec.rb +++ b/src/spec/models/provider_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Provider do context "(using stubbed out connect method)" do before(:each) do - @client = mock('DeltaCloud', :null_object => true) + @client = mock('DeltaCloud').as_null_object @provider = Factory.build(:mock_provider) @provider.stub!(:connect).and_return(@client) end @@ -48,7 +48,7 @@ describe Provider do @provider.stub(:connect).and_return(nil) deltacloud = @provider.connect @provider.should have(1).error_on(:url) - @provider.errors.on(:url).should eql("must be a valid provider url") + @provider.errors[:url].first.should eql("must be a valid provider url") @provider.should_not be_valid deltacloud.should be_nil end @@ -64,7 +64,8 @@ describe Provider do end
it "should set valid cloud type" do - @client.driver_name = @provider.cloud_type + ct = @provider.cloud_type + @client.stub!(:driver_name).and_return(ct) @provider.cloud_type = nil @provider.set_cloud_type! @provider.should be_valid @@ -87,7 +88,7 @@ describe Provider do
context "(using original connect method)" do it "should log errors when connecting to invalid url" do - @logger = mock('Logger', :null_object => true) + @logger = mock('Logger').as_null_object @provider = Factory.build(:mock_provider) @provider.stub!(:logger).and_return(@logger)
diff --git a/src/spec/models/template_spec.rb b/src/spec/models/template_spec.rb index 4a42996..ae04fb2 100644 --- a/src/spec/models/template_spec.rb +++ b/src/spec/models/template_spec.rb @@ -18,8 +18,8 @@ describe Template do t = Factory.build(:template) t.name = ('a' * 256) t.valid?.should be_false - t.errors[:name].should_not be_nil - t.errors[:name].should =~ /^is too long.*/ + t.errors[:name].first.should_not be_nil + t.errors[:name].first.should =~ /^is too long.*/ end
it "should not destroy template if there are instances created from this template" do diff --git a/src/spec/models/user_spec.rb b/src/spec/models/user_spec.rb index e7e69c7..a2d72bd 100644 --- a/src/spec/models/user_spec.rb +++ b/src/spec/models/user_spec.rb @@ -47,16 +47,16 @@ describe User do u = Factory(:tuser) u.first_name = ('a' * 256) u.valid?.should be_false - u.errors[:first_name].should_not be_nil - u.errors[:first_name].should =~ /^is too long.*/ + u.errors[:first_name].first.should_not be_nil + u.errors[:first_name].first.should =~ /^is too long.*/ end
it "should not be valid if last name is too long" do u = Factory(:tuser) u.last_name = ('a' * 256) u.valid?.should be_false - u.errors[:last_name].should_not be_nil - u.errors[:last_name].should =~ /^is too long.*/ + u.errors[:last_name].first.should_not be_nil + u.errors[:last_name].first.should =~ /^is too long.*/ end
end diff --git a/src/spec/services/data_service_active_record_spec.rb b/src/spec/services/data_service_active_record_spec.rb index b443fa9..11f0bc8 100644 --- a/src/spec/services/data_service_active_record_spec.rb +++ b/src/spec/services/data_service_active_record_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe DataServiceActiveRecord do
it "should calculate the total instance quota usage for a provider with a number of cloud accounts" do - client = mock('DeltaCloud', :null_object => true) + client = mock('DeltaCloud').as_null_object provider = Factory.build(:mock_provider) provider.stub!(:connect).and_return(client) provider.save! @@ -31,7 +31,7 @@ describe DataServiceActiveRecord do end
it "should calculate the total number of instances and maximum number of instances of a cloud account" do - client = mock('DeltaCloud', :null_object => true) + client = mock('DeltaCloud').as_null_object provider = Factory.build(:mock_provider) provider.stub!(:connect).and_return(client) provider.save! @@ -122,7 +122,7 @@ describe DataServiceActiveRecord do end_time = Time.utc(2010,"jan",1,20,15,1) start_time = end_time - (interval_length * no_intervals)
- client = mock('DeltaCloud', :null_object => true) + client = mock('DeltaCloud').as_null_object provider = Factory.build(:mock_provider) provider.stub!(:connect).and_return(client) provider.save! diff --git a/src/spec/services/registration_service_spec.rb b/src/spec/services/registration_service_spec.rb index 41f6764..15e2dc9 100644 --- a/src/spec/services/registration_service_spec.rb +++ b/src/spec/services/registration_service_spec.rb @@ -2,6 +2,7 @@ require 'spec_helper'
describe RegistrationService do
+ fixtures :all before(:each) do Factory.create(:default_quota_metadata) Factory.create(:default_role_metadata) @@ -16,7 +17,7 @@ describe RegistrationService do r.save.should be_false user.errors.empty?.should be_false user.errors.find_all do |attr,msg| - ["email","password","password_confirmation"].include?(attr).should be_true + [:email, :password, :password_confirmation].include?(attr).should be_true end end
diff --git a/src/spec/spec.opts b/src/spec/spec.opts deleted file mode 100644 index 391705b..0000000 --- a/src/spec/spec.opts +++ /dev/null @@ -1,4 +0,0 @@ ---colour ---format progress ---loadby mtime ---reverse diff --git a/src/spec/spec_helper.rb b/src/spec/spec_helper.rb index f7db6ee..f553c22 100644 --- a/src/spec/spec_helper.rb +++ b/src/spec/spec_helper.rb @@ -1,66 +1,34 @@ -# This file is copied to ~/spec when you run 'ruby script/generate rspec' -# from the project root directory. +# This file is copied to spec/ when you run 'rails generate rspec:install' ENV["RAILS_ENV"] ||= 'test' -require File.expand_path(File.join(File.dirname(__FILE__),'..','config','environment')) -require 'spec/autorun' -require 'spec/rails' +require File.expand_path("../../config/environment", __FILE__) +require 'rspec/rails' require 'authlogic/test_case' require 'timecop' require 'database_cleaner'
-# Uncomment the next line to use webrat's matchers -#require 'webrat/integrations/rspec-rails' +# Requires supporting ruby files with custom matchers and macros, etc, +# in spec/support/ and its subdirectories. +Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
-# Requires supporting files with custom matchers and macros, etc, -# in ./support/ and its subdirectories. -Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f} - -Spec::Runner.configure do |config| - # If you're not using ActiveRecord you should remove these - # lines, delete config/database.yml and disable :active_record - # in your config/boot.rb - config.use_transactional_fixtures = true - config.use_instantiated_fixtures = false - config.fixture_path = RAILS_ROOT + '/spec/fixtures/' - - # == Fixtures - # - # You can declare fixtures for each example_group like this: - # describe "...." do - # fixtures :table_a, :table_b - # - # Alternatively, if you prefer to declare them only once, you can - # do so right here. Just uncomment the next line and replace the fixture - # names with your fixtures. - # - # config.global_fixtures = :table_a, :table_b - # - # If you declare global fixtures, be aware that they will be declared - # for all of your examples, even those that don't use them. - # - # You can also declare which fixtures to use (for example fixtures for test/fixtures): - # - # config.fixture_path = RAILS_ROOT + '/spec/fixtures/' +RSpec.configure do |config| # # == Mock Framework # - # RSpec uses its own mocking framework by default. If you prefer to - # use mocha, flexmock or RR, uncomment the appropriate line: + # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line: # # config.mock_with :mocha # config.mock_with :flexmock # config.mock_with :rr - # - # == Notes - # - # For more information take a look at Spec::Runner::Configuration and Spec::Runner - config.before(:each, :type => :controller) do - #activate_authlogic - @default_zone_metadata = Factory.create(:default_zone_metadata) - end - config.after(:each, :type => :controller) do - #current_user_session.destroy - end + config.mock_with :rspec + + # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures + config.fixture_path = "#{::Rails.root}/spec/fixtures" + + # If you're not using ActiveRecord, or you'd prefer not to run each of your + # examples within a transaction, remove the following line or assign false + # instead of true. + #config.use_transactional_fixtures = true + config.use_instantiated_fixtures = false
# Database cleaner config.before(:suite) do