rspec_candy 0.3.1 → 0.4.0

data/lib/rspec_candy/switcher.rb

@@ -2,34 +2,46 @@ module RSpecCandy
   module Switcher
     extend self
 
+    # def rspec_version
+    #   if defined?(RSpec::Core)
+    #     :rspec2
+    #   elsif defined?(Spec)
+    #     :rspec1
+    #   else
+    #     raise 'Cannot determine RSpec version'
+    #   end
+    # end
+
     def rspec_version
-      if defined?(RSpec::Core)
-        :rspec2
-      elsif defined?(Spec)
-        :rspec1
+      if defined?(Spec)
+        1
       else
-        raise 'Cannot determine RSpec version'
+        require 'rspec/version'
+        RSpec::Version::STRING.to_i
       end
     end
 
-    def rails_version
-      if Rails.version.to_i < 3
-        :rails2
-      else
-        :rails3
-      end
+    def active_record_version
+      ActiveRecord::VERSION::MAJOR
     end
 
-    def rails_loaded?
-      defined?(Rails)
+    def active_record_loaded?
+      defined?(ActiveRecord)
     end
 
     def new_mock(*args)
-      rspec_root.const_get(:Mocks).const_get(:Mock).new(*args)
+      case rspec_version
+      when 1
+        Spec::Mocks::Mock.new(*args)
+      when 2
+        RSpec::Mocks::Mock.new(*args)
+      else
+        RSpec::Mocks::Double.new(*args)
+      end
     end
 
     def rspec_root
-      if rspec_version == :rspec1
+      if rspec_version == 1
         Spec
       else
         RSpec

data/lib/rspec_candy/version.rb

@@ -1,3 +1,3 @@
 module RSpecCandy
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/spec/{shared/rspec_candy → rspec_candy}/helpers/disposable_copy_spec.rb

@@ -39,7 +39,7 @@ describe RSpecCandy::Helpers::DisposableCopy do
       end
 
       it 'should evaluate the block after the copy has been renamed to the original class name' do
-        spy = mock('spy')
+        spy = double('spy')
         spy.should_receive(:observe_name).with('Model')
         Model.disposable_copy do
           spy.observe_name(name)

data/spec/rspec_candy/helpers/rails/it_should_run_callbacks_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe RSpecCandy::Helpers::Rails::ItShouldRunCallbacks do
+
+  describe '#it_should_run_callbacks' do
+
+    it 'should pass if all callbacks have been run' do
+      <<-describe_block.should pass_as_describe_block
+        describe Model, '#after_save' do
+          it_should_run_callbacks :after_save_callback2, :after_save_callback1
+        end
+      describe_block
+    end
+
+    it 'should only attempt to run the proper callbacks have been run' do
+      <<-describe_block.should fail_as_describe_block
+        describe Model, '#before_save' do
+          it_should_run_callbacks :after_save_callback2, :after_save_callback1
+        end
+      describe_block
+    end
+
+    it 'should not pass if a callback has not been run' do
+      <<-describe_block.should fail_as_describe_block
+        describe Model, '#after_create' do
+          it_should_run_callbacks :after_create_callback, :unknown_callback
+        end
+      describe_block
+    end
+
+    it 'should not actually execute the callbacks' do
+      <<-describe_block.should pass_as_describe_block
+        def Model.after_save_callback2
+          raise "called!"
+        end
+
+        describe Model, '#after_save' do
+          it_should_run_callbacks :after_save_callback1
+        end
+      describe_block
+    end
+
+  end
+
+  describe '#it_should_run_callbacks_in_order' do
+
+    supported_callbacks = case RSpecCandy::Switcher.rspec_version
+    when 1
+      %w[before after]
+    else
+      %w[before after around]
+    end
+
+    supported_callbacks.each do |kind|
+
+      it "should pass if all #{kind} callbacks are run in order" do
+        <<-describe_block.should pass_as_describe_block
+          describe Model, '##{kind}_save' do
+            it_should_run_callbacks_in_order :#{kind}_save_callback1, :#{kind}_save_callback2
+          end
+        describe_block
+      end
+
+      it "should not pass if a #{kind} callback has not been run" do
+        <<-describe_block.should fail_as_describe_block
+          describe Model, '##{kind}_create' do
+            it_should_run_callbacks_in_order :#{kind}_create_callback, :unknown_callback
+          end
+        describe_block
+      end
+
+      it "should not pass if #{kind} callbacks are run out of order" do
+        <<-describe_block.should fail_as_describe_block
+          describe Model, '##{kind}_save' do
+            it_should_run_callbacks_in_order :#{kind}_save_callback2, :#{kind}_save_callback1
+          end
+        describe_block
+      end
+
+    end
+
+  end
+
+end

data/spec/{shared/rspec_candy → rspec_candy}/helpers/rails/prevent_storage_spec.rb

@@ -41,7 +41,7 @@ describe RSpecCandy::Helpers::Rails::PreventStorage do
         it 'should prevent the record from being committed to the database' do
           record = Model.new
           record.prevent_storage
-          record.save.should be_false
+          record.save.should == false
           Model.count.should be_zero
         end
 

data/spec/{shared/rspec_candy → rspec_candy}/helpers/rails/store_with_values_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'has_defaults'
 
 describe RSpecCandy::Helpers::Rails::StoreWithValues do
 
@@ -9,7 +8,12 @@ describe RSpecCandy::Helpers::Rails::StoreWithValues do
 
       it 'should run after_initialize callbacks' do
         model = Model.disposable_copy do
-          has_defaults :string_field => 'Hello Universe'
+          after_initialize :set_defaults
+          def after_initialize # because old Rails
+          end
+          def set_defaults
+            self.string_field = 'Hello Universe'
+          end
         end
 
         record = model.store_with_values

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+$: << File.join(File.dirname(__FILE__), "/../../lib" )
+
+require 'rspec_candy/all'
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/shared_examples/**/*.rb"].each {|f| require f}
+

data/spec/support/database.rb

@@ -0,0 +1,15 @@
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+
+ActiveRecord::Migration.class_eval do
+
+  create_table :models do |t|
+    t.string :string_field
+    t.references :associated_model
+  end
+
+  create_table :sti_models do |t|
+    t.string :type
+    t.string :string_field
+  end
+
+end

data/spec/support/database_cleaner.rb

@@ -0,0 +1,20 @@
+require 'database_cleaner'
+DatabaseCleaner.strategy = :deletion
+
+if RSpecCandy::Switcher.rspec_version == 1
+
+  Spec::Runner.configure do |config|
+    config.append_before do
+      DatabaseCleaner.clean
+    end
+  end
+
+else
+
+  RSpec.configure do |config|
+    config.before do
+      DatabaseCleaner.clean
+    end
+  end
+
+end

data/spec/{shared/support → support}/matchers/pass_as_describe_block.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 class RSpecRemote
   def self.run_describe_block(describe_block)
     temp_path = nil
@@ -12,12 +14,16 @@ class RSpecRemote
   end
 end
 
-
 RSpecCandy::Switcher.define_matcher :pass_as_describe_block do
 
   match do |describe_block|
     rspec_out = RSpecRemote.run_describe_block(describe_block)
-    rspec_out.include?('0 failures')
+    passes = rspec_out.include?('0 failures')
+    # unless passes
+    #   puts "Expected RSpec output to not have failures:"
+    #   puts rspec_out
+    # end
+    passes
   end
 
 end
@@ -26,7 +32,12 @@ RSpecCandy::Switcher.define_matcher :fail_as_describe_block do
 
   match do |describe_block|
     rspec_out = RSpecRemote.run_describe_block(describe_block)
-    rspec_out.include?('1 failure')
+    passes = rspec_out.include?('1 failure')
+    # unless passes
+    #   puts "Expected RSpec output to not have failures:"
+    #   puts rspec_out
+    # end
+    passes
   end
 
 end

data/spec/{shared/support → support}/matchers/pass_as_example.rb

@@ -15,6 +15,7 @@ RSpecCandy::Switcher.define_matcher :pass_as_example do
 
   match do |example|
     rspec_out = RSpecRemote.run_example(example)
+    # puts rspec_out
     rspec_out.include?('0 failures')
   end
 
@@ -24,6 +25,7 @@ RSpecCandy::Switcher.define_matcher :fail_as_example do
 
   match do |example|
     rspec_out = RSpecRemote.run_example(example)
+    # puts rspec_out
     rspec_out.include?('1 failure')
   end
 

data/spec/{shared/app_root/app/models/model.rb → support/models.rb}

@@ -19,3 +19,22 @@ class Model < ActiveRecord::Base
   def around_save_callback2; yield; end
 
 end
+
+
+class StiParent < ActiveRecord::Base
+
+  self.table_name = 'sti_models'
+
+  before_save :crash
+  validate :crash
+
+  def crash
+    raise 'callback was run'
+  end
+
+end
+
+
+class StiChild < StiParent
+
+end

metadata

@@ -1,66 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rspec_candy
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Henning Koch
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-03 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-04-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sneaky-save
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sneaky-save
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RSpec helpers and matchers we use in our daily work at makandra.
 email: henning.koch@makandra.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .ruby-version
 - .travis.yml
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/Gemfile.rspec1-rails2
+- gemfiles/Gemfile.rspec1-rails2.lock
+- gemfiles/Gemfile.rspec2-rails3
+- gemfiles/Gemfile.rspec2-rails3.lock
+- gemfiles/Gemfile.rspec3-rails4
+- gemfiles/Gemfile.rspec3-rails4.lock
 - lib/rspec_candy.rb
 - lib/rspec_candy/all.rb
 - lib/rspec_candy/base.rb
@@ -83,100 +84,50 @@ files:
 - lib/rspec_candy/switcher.rb
 - lib/rspec_candy/version.rb
 - rspec_candy.gemspec
-- spec/rspec1/Gemfile
-- spec/rspec1/Gemfile.lock
-- spec/rspec1/Rakefile
-- 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/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/spec_helper.rb
-- spec/rspec1/spec/switcher_spec.rb
-- spec/rspec2/.rspec
-- spec/rspec2/Gemfile
-- spec/rspec2/Gemfile.lock
-- spec/rspec2/Rakefile
-- spec/rspec2/app_root/.gitignore
-- spec/rspec2/app_root/config/application.rb
-- 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/test.rb
-- spec/rspec2/app_root/config/initializers/backtrace_silencers.rb
-- spec/rspec2/app_root/config/initializers/inflections.rb
-- spec/rspec2/app_root/config/initializers/mime_types.rb
-- spec/rspec2/app_root/config/initializers/secret_token.rb
-- spec/rspec2/app_root/config/initializers/session_store.rb
-- spec/rspec2/app_root/config/initializers/state_machine.rb
-- spec/rspec2/app_root/config/locales/en.yml
-- spec/rspec2/app_root/config/routes.rb
-- spec/rspec2/app_root/log/.gitkeep
-- spec/rspec2/rcov.opts
-- 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
-- spec/shared/app_root/app/models/sti_child.rb
-- spec/shared/app_root/app/models/sti_parent.rb
-- spec/shared/app_root/config/initializers/state_machine.rb
-- spec/shared/app_root/db/migrate/001_create_model.rb
-- spec/shared/app_root/db/migrate/002_create_state_machine_model.rb
-- spec/shared/app_root/db/migrate/003_create_sti_model.rb
-- spec/shared/rspec_candy/helpers/disposable_copy_spec.rb
-- spec/shared/rspec_candy/helpers/it_should_act_like_spec.rb
-- spec/shared/rspec_candy/helpers/new_with_stubs_spec.rb
-- spec/shared/rspec_candy/helpers/rails/it_should_run_callbacks_spec.rb
-- spec/shared/rspec_candy/helpers/rails/prevent_storage_spec.rb
-- spec/shared/rspec_candy/helpers/rails/store_with_values_spec.rb
-- spec/shared/rspec_candy/helpers/should_receive_and_execute_spec.rb
-- spec/shared/rspec_candy/helpers/should_receive_and_return_spec.rb
-- spec/shared/rspec_candy/helpers/should_receive_chain_spec.rb
-- spec/shared/rspec_candy/helpers/stub_any_instance_spec.rb
-- spec/shared/rspec_candy/helpers/stub_existing_spec.rb
-- spec/shared/rspec_candy/matchers/be_same_number_as_spec.rb
-- spec/shared/rspec_candy/matchers/be_same_second_as_spec.rb
-- spec/shared/rspec_candy/matchers/include_hash_spec.rb
-- spec/shared/support/matchers/pass_as_describe_block.rb
-- spec/shared/support/matchers/pass_as_example.rb
-has_rdoc: true
+- spec/rspec_candy/helpers/disposable_copy_spec.rb
+- spec/rspec_candy/helpers/it_should_act_like_spec.rb
+- spec/rspec_candy/helpers/new_with_stubs_spec.rb
+- spec/rspec_candy/helpers/rails/it_should_run_callbacks_spec.rb
+- spec/rspec_candy/helpers/rails/prevent_storage_spec.rb
+- spec/rspec_candy/helpers/rails/store_with_values_spec.rb
+- spec/rspec_candy/helpers/should_receive_and_execute_spec.rb
+- spec/rspec_candy/helpers/should_receive_and_return_spec.rb
+- spec/rspec_candy/helpers/should_receive_chain_spec.rb
+- spec/rspec_candy/helpers/stub_any_instance_spec.rb
+- spec/rspec_candy/helpers/stub_existing_spec.rb
+- spec/rspec_candy/matchers/be_same_number_as_spec.rb
+- spec/rspec_candy/matchers/be_same_second_as_spec.rb
+- spec/rspec_candy/matchers/include_hash_spec.rb
+- spec/shared_examples/.keep
+- spec/spec_helper.rb
+- spec/support/database.rb
+- spec/support/database_cleaner.rb
+- spec/support/matchers/pass_as_describe_block.rb
+- spec/support/matchers/pass_as_example.rb
+- spec/support/models.rb
 homepage: https://github.com/makandra/rspec_candy
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: RSpec helpers and matchers we use in our daily work at makandra.
 test_files: []
-