rspec_candy 0.3.1 → 0.4.0

data/.gitignore

@@ -3,3 +3,4 @@ pkg
 *.gem
 .idea
 spec/**/app_root/log/*
+Gemfile.lock

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
-  - "1.8.7"
   - "1.9.3"
-  - ree
-before_script: rake travis_ci:prepare
-script: rake all:bundle all:spec
+gemfile:
+  - gemfiles/Gemfile.rspec1-rails2
+  - gemfiles/Gemfile.rspec2-rails3
+  - gemfiles/Gemfile.rspec3-rails4
+script: rake spec
 notifications:
   email:
     - fail@makandra.de

data/README.md

@@ -3,7 +3,11 @@ rspec_candy [![Build Status](https://secure.travis-ci.org/makandra/rspec_candy.p
 
 A collection of nifty helpers and matchers for your RSpec suite.
 
-Will work for RSpec1 and Rails 2, or RSpec2 and Rails 3, or no Rails at all.
+Tested on:
+
+- RSpec 1 / Rails 2.3
+- RSpec 2 / Rails 3.2
+- RSpec 3 / Rails 4.2
 
 
 ##Installation
@@ -138,20 +142,8 @@ If you only care about the matchers or helpers you can also more specifically re
        it_should_run_callbacks :notify_this, :notify_that
      end
   
-   If you use the state_machine gem, you can also spec callbacks for state_machine transitions:
-
-
-    describe Model, '#my_event from :my_state1 to :my_state" do
-      it_should_run_callbacks :notify_this, :notify_that
-    end
 
 
-  If you have used a custom state machine name, you can use specify it like this:
-
-    describe Model, '#my_event on :my_machine from :my_state1 to :my_state" do
-      it_should_run_callbacks :notify_this, :notify_that
-    end
-
 **it_should_run_callbacks_in_order**
 
   Like `it_should_run_callbacks`, but also checks the correct order.

data/Rakefile

@@ -1,48 +1,41 @@
 require 'rake'
-
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 desc 'Default: Run all specs.'
 task :default => 'all:spec'
 
-namespace :travis_ci do
-
-  desc 'Things to do before Travis CI begins'
-  task :prepare => :slimgems
-
-  desc 'Install slimgems'
-  task :slimgems do
-    system('gem install slimgems')
-  end
-
+task :spec do
+  rspec_binary = ENV['BUNDLE_GEMFILE'].include?('rspec1') ? 'spec' : 'rspec'
+  examples = ENV['SPEC'] || 'spec'
+  success &= system("bundle exec #{rspec_binary} #{examples}")
 end
 
 namespace :all do
 
-  desc "Run specs on all spec apps"
+  desc "Run specs on all versions"
   task :spec do
     success = true
-    for_each_directory_of('spec/**/Rakefile') do |directory|
-      env = "SPEC=../../#{ENV['SPEC']} " if ENV['SPEC']
-      success &= system("cd #{directory} && #{env} bundle exec rake spec")
+    for_each_gemfile do
+      Rake::Task['spec'].execute
     end
     fail "Tests failed" unless success
   end
 
-  desc "Bundle all spec apps"
+  desc "Bundle all versions"
   task :bundle do
-    for_each_directory_of('spec/**/Gemfile') do |directory|
-      system("cd #{directory} && rm -f Gemfile.lock && bundle install")
+    for_each_gemfile do
+      system('bundle install')
     end
   end
 
 end
 
-def for_each_directory_of(path, &block)
-  Dir[path].sort.each do |rakefile|
-    directory = File.dirname(rakefile)
-    puts '', "\033[44m#{directory}\033[0m", ''
-    block.call(directory)
+def for_each_gemfile
+  version = ENV['VERSION'] || '*'
+  Dir["gemfiles/Gemfile.#{version}"].sort.each do |gemfile|
+    next if gemfile =~ /.lock/
+    puts '', "\033[44m#{gemfile}\033[0m", ''
+    ENV['BUNDLE_GEMFILE'] = gemfile
+    yield
   end
 end
-

data/gemfiles/Gemfile.rspec1-rails2

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+Deprecate.skip = true if defined?(Deprecate.skip)
+Gem::Deprecate.skip = true if defined?(Gem::Deprecate.skip)
+
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>2.3.18'
+gem 'rspec', '~>1.3.2'
+gem 'sqlite3'
+gem 'database_cleaner'
+gem 'rake'
+
+gem 'rspec_candy', :path => '..'
+
+# gem 'test-unit', '~>1.2', :platforms => :ruby_19
+# gem 'hoe', '=2.8.0', :platforms => :ruby_19

data/gemfiles/Gemfile.rspec1-rails2.lock

@@ -0,0 +1,31 @@
+PATH
+  remote: ..
+  specs:
+    rspec_candy (0.4.0)
+      rspec
+      sneaky-save
+
+GEM
+  remote: https://rubygems.org/
+  remote: https://rubygems.org/
+  specs:
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
+    database_cleaner (1.2.0)
+    rake (10.4.2)
+    rspec (1.3.2)
+    sneaky-save (0.0.2)
+      activerecord (>= 2.3.2)
+    sqlite3 (1.3.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 2.3.18)
+  database_cleaner
+  rake
+  rspec (~> 1.3.2)
+  rspec_candy!
+  sqlite3

data/gemfiles/Gemfile.rspec2-rails3

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>3.2.0'
+gem 'rspec', '~>2.14.1'
+gem 'sqlite3'
+gem 'database_cleaner'
+gem 'rake'
+
+gem 'rspec_candy', :path => '..'

data/gemfiles/Gemfile.rspec2-rails3.lock

@@ -0,0 +1,51 @@
+PATH
+  remote: ..
+  specs:
+    rspec_candy (0.4.0)
+      rspec
+      sneaky-save
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.2.21)
+      activesupport (= 3.2.21)
+      builder (~> 3.0.0)
+    activerecord (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.21)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    arel (3.0.3)
+    builder (3.0.4)
+    database_cleaner (1.2.0)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    multi_json (1.11.0)
+    rake (10.4.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    sneaky-save (0.1.0)
+      activerecord (>= 3.2.0)
+    sqlite3 (1.3.10)
+    tzinfo (0.3.43)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.2.0)
+  database_cleaner
+  rake
+  rspec (~> 2.14.1)
+  rspec_candy!
+  sqlite3

data/gemfiles/Gemfile.rspec3-rails4

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>4.2.0'
+gem 'rspec', '~>3.2.0'
+gem 'sqlite3'
+gem 'database_cleaner'
+gem 'rake'
+
+gem 'rspec_candy', :path => '..'

data/gemfiles/Gemfile.rspec3-rails4.lock

@@ -0,0 +1,61 @@
+PATH
+  remote: ..
+  specs:
+    rspec_candy (0.4.0)
+      rspec
+      sneaky-save
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
+    database_cleaner (1.2.0)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    json (1.8.2)
+    minitest (5.5.1)
+    rake (10.4.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    sneaky-save (0.1.0)
+      activerecord (>= 3.2.0)
+    sqlite3 (1.3.10)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.2.0)
+  database_cleaner
+  rake
+  rspec (~> 3.2.0)
+  rspec_candy!
+  sqlite3

data/lib/rspec_candy/base.rb

@@ -1,2 +1,3 @@
+require 'active_record'
 require 'rspec_candy/version'
 require 'rspec_candy/switcher'

data/lib/rspec_candy/helpers.rb

@@ -8,7 +8,7 @@ require 'rspec_candy/helpers/should_receive_chain'
 require 'rspec_candy/helpers/stub_any_instance'
 require 'rspec_candy/helpers/stub_existing'
 
-if RSpecCandy::Switcher.rails_loaded?
+if RSpecCandy::Switcher.active_record_loaded?
   require 'rspec_candy/helpers/rails/store_with_values'
   require 'rspec_candy/helpers/rails/it_should_run_callbacks'
   require 'rspec_candy/helpers/rails/prevent_storage'

data/lib/rspec_candy/helpers/it_should_act_like.rb

@@ -25,9 +25,9 @@ module RSpecCandy
       end
 
       case Switcher.rspec_version
-      when :rspec1
+      when 1
         Spec::Example::ExampleGroupMethods.send(:include, self)
-      when :rspec2
+      else
         RSpec::Core::ExampleGroup.singleton_class.send(:include, self)
       end
     end

data/lib/rspec_candy/helpers/rails/it_should_run_callbacks.rb

@@ -18,17 +18,14 @@ module RSpecCandy
                 should = ['should run callbacks', callbacks.inspect, ('in order' if options[:ordered]), reason].compact.join ' '
 
                 prose = case Switcher.rspec_version
-                when :rspec1
+                when 1
                   description_parts.last
-                when :rspec2
+                else
                   description.split(/(?=#)/).last
                 end
 
                 send(:it, should) do
                   extend ExampleMethods
-                  if subject.class.respond_to?(:state_machine) and defined?(StateMachine)
-                    extend StateMachineExampleMethods
-                  end
                   callbacks.each do |callback|
                     expectation = subject.should_receive(callback).once
                     expectation.ordered if options[:ordered]
@@ -48,13 +45,13 @@ module RSpecCandy
           end
 
           case Switcher.rspec_version
-          when :rspec1
+          when 1
 
             def run_active_record_callbacks_from_prose(prose)
               subject.run_callbacks(prose.sub(/^#/, ''))
             end
 
-          when :rspec2
+          else
 
             def run_active_record_callbacks_from_prose(prose)
               hook = prose.split.last.sub(/^#/, '')
@@ -82,27 +79,10 @@ module RSpecCandy
           end
         end
 
-        module StateMachineExampleMethods
-          def run_all_callbacks(prose)
-            run_state_machine_callbacks_from_prose(prose) or super
-          end
-
-          def run_state_machine_callbacks_from_prose(prose)
-            if parts = prose.match(/^(#\w+) (?:on ([\:\w]+) )?from ([\:\w]+) to ([\:\w]+)$/)
-              name = parts[1].sub(/^#/, '').to_sym
-              machine_name = parts[2] ? parts[2].sub(/^:/, '').to_sym : :state
-              from = parts[3].sub(/^:/, '').to_sym
-              to = parts[4].sub(/^:/, '').to_sym
-              transition = StateMachine::Transition.new(subject, subject.class.state_machine(machine_name), name, from, to)
-              transition.run_callbacks
-            end
-          end
-        end
-
         case Switcher.rspec_version
-        when :rspec1
+        when 1
           Spec::Example::ExampleGroupMethods.send(:include, self::ExampleGroupMethods)
-        when :rspec2
+        else
           RSpec::Core::ExampleGroup.singleton_class.send(:include, self::ExampleGroupMethods)
         end
 

data/lib/rspec_candy/helpers/rails/store_with_values.rb

@@ -5,13 +5,18 @@ module RSpecCandy
 
         def store_with_values(values = {})
           record = new
-          if Switcher.rails_version == :rails2
+          case Switcher.active_record_version
+          when 2
             record.send(:attributes=, values, false)
             record.send(:create_without_callbacks)
-          else
+          when 3
             require 'sneaky-save'
             record.assign_attributes(values, :without_protection => true)
             record.sneaky_save
+          else
+            require 'sneaky-save'
+            record.assign_attributes(values)
+            record.sneaky_save
           end
           record
         end

data/lib/rspec_candy/helpers/stub_any_instance.rb

@@ -4,7 +4,7 @@ module RSpecCandy
 
       def stub_any_instance(stubs)
         case Switcher.rspec_version
-        when :rspec1
+        when 1
           unstubbed_new = method(:new)
           stub(:new).and_return do |*args|
             unstubbed_new.call(*args).tap do |obj|
@@ -12,7 +12,7 @@ module RSpecCandy
             end
           end
           stubs
-        when :rspec2
+        else
           any_instance.stub(stubs)
         end
       end