rspec_candy 0.2.2 → 0.2.3

data/README.md

@@ -169,3 +169,4 @@ If you only care about the matchers or helpers you can also more specifically re
 - `Object#should_not_receive_and_execute` has been removed (same as `Object#should_not_receive`)
 - `should_receive_all_with` (over-generic method name for a helper that is rarely useful)
 
+

data/Rakefile

@@ -1,5 +1,4 @@
 require 'rake'
-require 'spec/rake/spectask'
 
 require "bundler/gem_tasks"
 
@@ -34,14 +33,4 @@ def for_each_directory_of(path, &block)
     block.call(directory)
   end
 end
-#
-#
-#desc "Run all specs"
-#task :all_specs do
-#  Dir['spec/**/Rakefile'].sort.each do |rakefile|
-#    directory = File.dirname(rakefile)
-#    puts '', "\033[44m#{directory}\033[0m", ''
-#    env = "SPEC=../../#{ENV['SPEC']} " if ENV['SPEC']
-#    system("cd #{directory} && #{env} bundle exec rake")
-#  end
-#end
+

data/lib/rspec_candy/switcher.rb

@@ -29,7 +29,11 @@ module RSpecCandy
     end
 
     def rspec_root
-      (defined?(RSpec) ? RSpec : Spec)
+      if rspec_version == :rspec1
+        Spec
+      else
+        RSpec
+      end
     end
 
     def rspec_matcher_registry

data/lib/rspec_candy/version.rb

@@ -1,3 +1,3 @@
 module RSpecCandy
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/rspec1/Gemfile

@@ -4,8 +4,11 @@ gem 'sqlite3'
 gem 'rails', '~>2'
 gem 'rspec', '~>1'
 gem 'rspec-rails', '~>1'
-gem 'ruby-debug'
+gem 'ruby-debug', :platforms => :ruby_18
+gem 'debugger', :platforms => :ruby_19
 gem 'rspec_candy', :path => '../..'
+gem 'test-unit', '~>1.2', :platforms => :ruby_19
+
 
 group :state_machine do
   gem 'state_machine'

data/spec/rspec1/app_root/config/database.yml

@@ -1,21 +1,4 @@
-in_memory:
+test:
   adapter: sqlite3
   database: ":memory:"
   verbosity: quiet
-sqlite:
-  adapter: sqlite
-  dbfile: plugin_test.sqlite.db
-sqlite3:
-  adapter: sqlite3
-  dbfile: plugin_test.sqlite3.db
-postgresql:
-  adapter: postgresql
-  username: postgres
-  password: postgres
-  database: plugin_test
-mysql:
-  adapter: mysql
-  host: localhost
-  username: root
-  password:
-  database: plugin_test

data/spec/rspec1/{spec_helper.rb → spec/spec_helper.rb}

@@ -1,10 +1,11 @@
 $: << File.join(File.dirname(__FILE__), "/../lib" )
+$: << File.dirname(__FILE__)
 
-# Set the default environment to sqlite3's in_memory database
-ENV['RAILS_ENV'] ||= 'in_memory'
+ENV['RAILS_ENV'] = 'test'
+ENV['RAILS_ROOT'] = 'app_root'
 
 # Load the Rails environment and testing framework
-require "#{File.dirname(__FILE__)}/app_root/config/environment"
+require "#{File.dirname(__FILE__)}/../app_root/config/environment"
 require 'spec/rails'
 
 # Load dependencies

data/spec/rspec1/spec/switcher_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+# Some gems that are actually compatible with RSpec 1 define RSpec,
+# so make sure we don't detect on that.
+module ::RSpec
+end
+
+describe RSpecCandy::Switcher do
+
+  describe "#rspec_version" do
+
+    it "should detect rspec1" do
+      RSpecCandy::Switcher.rspec_version.should == :rspec1
+    end
+
+  end
+
+  describe '#rspec_root' do
+
+    it 'should return the Spec module' do
+      RSpecCandy::Switcher.rspec_root.should == Spec
+    end
+
+  end
+
+end

data/spec/rspec2/Gemfile

@@ -4,10 +4,10 @@ gem 'sqlite3'
 gem 'rails', '~>3'
 gem 'rspec', '~>2'
 gem 'rspec-rails', '~>2'
-gem 'ruby-debug'
+gem 'ruby-debug', :platforms => :ruby_18
+gem 'debugger', :platforms => :ruby_19
 gem 'rspec_candy', :path => '../..'
 
-
 group :state_machine do
   gem 'state_machine'
 end

data/spec/rspec2/app_root/config/database.yml

@@ -1,21 +1,4 @@
-in_memory:
+test:
   adapter: sqlite3
   database: ":memory:"
   verbosity: quiet
-sqlite:
-  adapter: sqlite
-  dbfile: plugin_test.sqlite.db
-sqlite3:
-  adapter: sqlite3
-  dbfile: plugin_test.sqlite3.db
-postgresql:
-  adapter: postgresql
-  username: postgres
-  password: postgres
-  database: plugin_test
-mysql:
-  adapter: mysql
-  host: localhost
-  username: root
-  password:
-  database: plugin_test

data/spec/rspec2/app_root/config/environments/test.rb

@@ -1,35 +0,0 @@
-HasDefaultSpecApp::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
-  config.cache_classes = true
-
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Raise exceptions instead of rendering exception templates
-  config.action_dispatch.show_exceptions = false
-
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
-
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
-  # Print deprecation notices to the stderr
-  config.active_support.deprecation = :stderr
-end

data/spec/rspec2/{spec_helper.rb → spec/spec_helper.rb}

@@ -1,11 +1,10 @@
 $: << File.join(File.dirname(__FILE__), "/../lib" )
 
-# Set the default environment to sqlite3's in_memory database
-ENV['RAILS_ENV'] ||= 'in_memory'
+ENV['RAILS_ENV'] = 'test'
 ENV['RAILS_ROOT'] = 'app_root'
 
 # Load the Rails environment and testing framework
-require "#{File.dirname(__FILE__)}/app_root/config/environment"
+require "#{File.dirname(__FILE__)}/../app_root/config/environment"
 require 'rspec/rails'
 
 # Load dependencies

data/spec/rspec2/spec/switcher_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe RSpecCandy::Switcher do
+
+  describe "#rspec_version" do
+
+    it "should detect rspec2" do
+      RSpecCandy::Switcher.rspec_version.should == :rspec2
+    end
+
+  end
+
+  describe '#rspec_root' do
+
+    it 'should return the RSpec module' do
+      RSpecCandy::Switcher.rspec_root.should == RSpec
+    end
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec_candy
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Henning Koch
@@ -73,18 +73,14 @@ files:
 - spec/rspec1/app_root/config/boot.rb
 - spec/rspec1/app_root/config/database.yml
 - spec/rspec1/app_root/config/environment.rb
-- spec/rspec1/app_root/config/environments/in_memory.rb
-- spec/rspec1/app_root/config/environments/mysql.rb
-- spec/rspec1/app_root/config/environments/postgresql.rb
-- spec/rspec1/app_root/config/environments/sqlite.rb
-- spec/rspec1/app_root/config/environments/sqlite3.rb
+- spec/rspec1/app_root/config/environments/test.rb
 - spec/rspec1/app_root/config/initializers/state_machine.rb
 - spec/rspec1/app_root/config/routes.rb
 - spec/rspec1/app_root/log/.gitignore
 - spec/rspec1/rcov.opts
 - spec/rspec1/spec.opts
-- spec/rspec1/spec_helper.rb
-- spec/rspec1/switcher_spec.rb
+- spec/rspec1/spec/spec_helper.rb
+- spec/rspec1/spec/switcher_spec.rb
 - spec/rspec2/.rspec
 - spec/rspec2/Gemfile
 - spec/rspec2/Rakefile
@@ -93,11 +89,6 @@ files:
 - spec/rspec2/app_root/config/boot.rb
 - spec/rspec2/app_root/config/database.yml
 - spec/rspec2/app_root/config/environment.rb
-- spec/rspec2/app_root/config/environments/in_memory.rb
-- spec/rspec2/app_root/config/environments/mysql.rb
-- spec/rspec2/app_root/config/environments/postgresql.rb
-- spec/rspec2/app_root/config/environments/sqlite.rb
-- spec/rspec2/app_root/config/environments/sqlite3.rb
 - spec/rspec2/app_root/config/environments/test.rb
 - spec/rspec2/app_root/config/initializers/backtrace_silencers.rb
 - spec/rspec2/app_root/config/initializers/inflections.rb
@@ -109,7 +100,8 @@ files:
 - spec/rspec2/app_root/config/routes.rb
 - spec/rspec2/app_root/log/.gitkeep
 - spec/rspec2/rcov.opts
-- spec/rspec2/spec_helper.rb
+- spec/rspec2/spec/spec_helper.rb
+- spec/rspec2/spec/switcher_spec.rb
 - spec/shared/app_root/app/controllers/application_controller.rb
 - spec/shared/app_root/app/models/model.rb
 - spec/shared/app_root/app/models/state_machine_model.rb

data/spec/rspec1/switcher_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe RSpecCandy::Switcher do
-  describe "#rspec_version" do
-    it "detects rspec1" do
-      RSpecCandy::Switcher.rspec_version.should == :rspec1
-    end
-
-    it "detects rspec1 when RSpec is defined" do
-      module ::RSpec
-      end
-      RSpecCandy::Switcher.rspec_version.should == :rspec1
-    end
-  end
-end