shoulda-matchers 2.8.0 → 3.0.0.rc1

data/spec/acceptance/rails_integration_spec.rb

@@ -14,7 +14,7 @@ describe 'shoulda-matchers integrates with Rails' do
       end
     FILE
 
-    run_rake_tasks!('db:migrate', 'db:test:prepare')
+    run_rake_tasks!(*%w(db:drop db:create db:migrate))
 
     write_file 'app/models/user.rb', <<-FILE
       class User < ActiveRecord::Base
@@ -34,10 +34,13 @@ describe 'shoulda-matchers integrates with Rails' do
     configure_routes_with_single_wildcard_route
   end
 
-  specify 'in a project that uses Test::Unit' do
+  specify 'in a project that uses the default test framework' do
     updating_bundle do
       add_gems_for_n_unit
-      add_shoulda_matchers_to_project
+      add_shoulda_matchers_to_project(
+        test_frameworks: [default_test_framework],
+        libraries: [:rails]
+      )
     end
 
     run_tests_for_n_unit
@@ -46,7 +49,10 @@ describe 'shoulda-matchers integrates with Rails' do
   specify 'in a project that uses RSpec' do
     updating_bundle do
       add_gems_for_rspec
-      add_shoulda_matchers_to_project(test_frameworks: [:rspec])
+      add_shoulda_matchers_to_project(
+        test_frameworks: [:rspec],
+        libraries: [:rails]
+      )
     end
 
     run_tests_for_rspec
@@ -62,6 +68,7 @@ describe 'shoulda-matchers integrates with Rails' do
       add_gems_for_rspec
       add_shoulda_matchers_to_project(
         test_frameworks: [:rspec],
+        libraries: [:rails],
         manually: true
       )
     end
@@ -75,7 +82,10 @@ describe 'shoulda-matchers integrates with Rails' do
     updating_bundle do
       add_gems_for_n_unit
       add_gems_for_rspec
-      add_shoulda_matchers_to_project
+      add_shoulda_matchers_to_project(
+        test_frameworks: [:rspec, nil],
+        libraries: [:rails]
+      )
     end
 
     run_tests_for_n_unit

data/spec/acceptance_spec_helper.rb

@@ -1,4 +1,12 @@
+require_relative 'support/tests/current_bundle'
+
+Tests::CurrentBundle.instance.assert_appraisal!
+
+#---
+
 require 'rspec/core'
+require 'pry'
+require 'pry-byebug'
 
 Dir[ File.join(File.expand_path('../support/acceptance/**/*.rb', __FILE__)) ].sort.each do |file|
   require file

data/spec/doublespeak_spec_helper.rb

@@ -0,0 +1,14 @@
+require 'shoulda-matchers'
+
+PROJECT_ROOT = File.expand_path('../..', __FILE__)
+$LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
+
+RSpec.configure do |config|
+  config.order = :random
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
+  config.mock_with :rspec
+end

data/spec/support/acceptance/adds_shoulda_matchers_to_project.rb

@@ -0,0 +1,110 @@
+require_relative 'helpers/base_helpers'
+require_relative 'helpers/rspec_helpers'
+
+module AcceptanceTests
+  class AddsShouldaMatchersToProject
+    def self.call(options)
+      new(options).call
+    end
+
+    include BaseHelpers
+    include RspecHelpers
+
+    def initialize(options)
+      @options = options
+    end
+
+    def call
+      add_gem 'shoulda-matchers', gem_options
+      configure_test_helper_files
+    end
+
+    protected
+
+    attr_reader :options
+
+    private
+
+    def gem_options
+      gem_options = { path: fs.root_directory }
+
+      if options[:manually]
+        gem_options[:require] = false
+      end
+
+      gem_options
+    end
+
+    def configure_test_helper_files
+      each_test_helper_file do |test_helper_file, test_framework, library|
+        add_configuration_block_to(
+          test_helper_file,
+          test_framework,
+          library
+        )
+      end
+    end
+
+    def each_test_helper_file
+      options[:test_frameworks].each do |test_framework|
+        libraries = options.fetch(:libraries, [])
+        test_helper_file = test_helper_file_for(test_framework, libraries)
+        yield test_helper_file, test_framework, libraries
+      end
+    end
+
+    def add_configuration_block_to(test_helper_file, test_framework, libraries)
+      test_framework_config = test_framework_config_for(test_framework)
+      library_config = library_config_for(libraries)
+
+      content = <<-EOT
+        Shoulda::Matchers.configure do |config|
+          config.integrate do |with|
+            #{test_framework_config}
+            #{library_config}
+          end
+        end
+      EOT
+
+      if options[:manually]
+        content = "require 'shoulda-matchers'\n#{content}"
+      end
+
+      fs.append_to_file(test_helper_file, content)
+    end
+
+    def test_framework_config_for(test_framework)
+      if test_framework
+        "with.test_framework :#{test_framework}\n"
+      else
+        ''
+      end
+    end
+
+    def library_config_for(libraries)
+      libraries.map { |library| "with.library :#{library}" }.join("\n")
+    end
+
+    def test_helper_file_for(test_framework, libraries)
+      if integrates_with_rails?(test_framework, libraries) ||
+        integrates_with_nunit?(test_framework)
+        'test/test_helper.rb'
+      elsif integrates_with_rspec?(test_framework)
+        spec_helper_file_path
+      end
+    end
+
+    def integrates_with_nunit?(test_framework)
+      nunit_frameworks = [:test_unit, :minitest, :minitest_4, :minitest_5]
+      nunit_frameworks.include?(test_framework)
+    end
+
+    def integrates_with_rspec?(test_framework)
+      test_framework == :rspec
+    end
+
+    def integrates_with_rails?(test_framework, libraries)
+      test_framework.nil? && libraries.include?(:rails)
+    end
+  end
+end

data/spec/support/acceptance/helpers.rb

@@ -2,6 +2,7 @@ require_relative 'helpers/active_model_helpers'
 require_relative 'helpers/base_helpers'
 require_relative 'helpers/command_helpers'
 require_relative 'helpers/gem_helpers'
+require_relative 'helpers/n_unit_helpers'
 require_relative 'helpers/rails_version_helpers'
 require_relative 'helpers/rspec_helpers'
 require_relative 'helpers/ruby_version_helpers'
@@ -21,6 +22,7 @@ module AcceptanceTests
     include BaseHelpers
     include CommandHelpers
     include GemHelpers
+    include NUnitHelpers
     include RailsVersionHelpers
     include RspecHelpers
     include RubyVersionHelpers

data/spec/support/acceptance/helpers/base_helpers.rb

@@ -1,5 +1,6 @@
-require_relative '../../tests/filesystem'
 require_relative '../../tests/bundle'
+require_relative '../../tests/database'
+require_relative '../../tests/filesystem'
 
 module AcceptanceTests
   module BaseHelpers
@@ -10,5 +11,9 @@ module AcceptanceTests
     def bundle
       @_bundle ||= Tests::Bundle.new
     end
+
+    def database
+      @_database ||= Tests::Database.instance
+    end
   end
 end

data/spec/support/acceptance/helpers/command_helpers.rb

@@ -41,11 +41,15 @@ module AcceptanceTests
     end
 
     def run_rake_tasks(*tasks)
-      run_command_within_bundle('rake', *tasks)
+      options = tasks.last.is_a?(Hash) ? tasks.pop : {}
+      args = ['rake', *tasks, '--trace'] + [options]
+      run_command_within_bundle(*args)
     end
 
     def run_rake_tasks!(*tasks)
-      run_command_within_bundle!('rake', *tasks)
+      options = tasks.last.is_a?(Hash) ? tasks.pop : {}
+      args = ['rake', *tasks, '--trace'] + [options]
+      run_command_within_bundle!(*args)
     end
   end
 end

data/spec/support/acceptance/helpers/minitest_helpers.rb

@@ -4,14 +4,6 @@ module AcceptanceTests
   module MinitestHelpers
     include GemHelpers
 
-    def minitest_test_case_superclass
-      if minitest_version >= 5
-        'Minitest::Test'
-      else
-        'MiniTest::Unit::TestCase'
-      end
-    end
-
     def minitest_version
       bundle_version_of('minitest')
     end

data/spec/support/acceptance/helpers/n_unit_helpers.rb

@@ -0,0 +1,25 @@
+require_relative 'rails_version_helpers'
+
+module AcceptanceTests
+  module NUnitHelpers
+    include RailsVersionHelpers
+
+    def n_unit_test_case_superclass
+      case default_test_framework
+        when :test_unit then 'Test::Unit::TestCase'
+        when :minitest_4 then 'MiniTest::Unit::TestCase'
+        else 'Minitest::Test'
+      end
+    end
+
+    def default_test_framework
+      if rails_version =~ '< 4'
+        :test_unit
+      elsif rails_version =~ '~> 4.0.0'
+        :minitest_4
+      else
+        :minitest
+      end
+    end
+  end
+end

data/spec/support/acceptance/helpers/rspec_helpers.rb

@@ -1,3 +1,5 @@
+require_relative 'gem_helpers'
+
 module AcceptanceTests
   module RspecHelpers
     include GemHelpers

data/spec/support/acceptance/helpers/step_helpers.rb

@@ -2,6 +2,8 @@ require_relative 'file_helpers'
 require_relative 'gem_helpers'
 require_relative 'minitest_helpers'
 
+require 'yaml'
+
 module AcceptanceTests
   module StepHelpers
     include FileHelpers
@@ -21,23 +23,7 @@ module AcceptanceTests
     end
 
     def add_shoulda_matchers_to_project(options = {})
-      gem_options = { path: fs.root_directory }
-
-      if options[:manually]
-        gem_options[:require] = false
-      end
-
-      add_gem 'shoulda-matchers', gem_options
-
-      if options[:manually]
-        if options[:test_frameworks].include?(:rspec)
-          append_to_file spec_helper_file_path, "require 'shoulda/matchers'"
-        end
-
-        if options[:test_frameworks].include?(:n_unit)
-          append_to_file 'test/test_helper.rb', "require 'shoulda/matchers'"
-        end
-      end
+      AddsShouldaMatchersToProject.call(options)
     end
 
     def add_minitest_to_project
@@ -61,8 +47,8 @@ module AcceptanceTests
       end
     end
 
-    def write_minitest_test(path)
-      contents = yield minitest_test_case_superclass
+    def write_n_unit_test(path)
+      contents = yield n_unit_test_case_superclass
       write_file(path, contents)
     end
 
@@ -85,6 +71,14 @@ module AcceptanceTests
         bundle.remove_gem 'turn'
         bundle.remove_gem 'coffee-rails'
         bundle.remove_gem 'uglifier'
+        bundle.remove_gem 'debugger'
+        bundle.remove_gem 'byebug'
+        bundle.remove_gem 'web-console'
+        bundle.add_gem 'pg'
+      end
+
+      fs.open('config/database.yml', 'w') do |file|
+        YAML.dump(database.config.to_hash, file)
       end
     end
 

data/spec/support/acceptance/matchers/have_output.rb

@@ -20,7 +20,7 @@ module AcceptanceTests
           "Expected output:\n" +
           output + "\n\n" +
           "Actual output:\n" +
-          runner.elided_output
+          runner.output
       end
 
       protected

data/spec/support/tests/bundle.rb

@@ -35,7 +35,7 @@ module Tests
 
     def remove_gem(gem)
       updating do
-        fs.remove_from_file('Gemfile', /^gem ("|')gem\1/)
+        fs.comment_lines_matching('Gemfile', /^[ ]*gem ("|')#{gem}\1/)
       end
     end
 

data/spec/support/tests/command_runner.rb

@@ -19,7 +19,7 @@ module Tests
       end
     end
 
-    attr_reader :status, :options, :env, :directory
+    attr_reader :status, :options, :env
     attr_accessor :command_prefix, :run_quickly, :run_successfully, :retries,
       :timeout
 
@@ -35,7 +35,7 @@ module Tests
 
       @wrapper = ->(block) { block.call }
       @command_prefix = ''
-      @directory = Dir.pwd
+      self.directory = Dir.pwd
       @run_quickly = false
       @run_successfully = false
       @retries = 1
@@ -47,8 +47,12 @@ module Tests
       @wrapper = block
     end
 
+    def directory
+      @options[:chdir]
+    end
+
     def directory=(directory)
-      @directory = directory || Dir.pwd
+      @options[:chdir] = directory || Dir.pwd
     end
 
     def formatted_command
@@ -60,9 +64,7 @@ module Tests
     def call
       possibly_retrying do
         possibly_running_quickly do
-          debug { "\n\e[32mRunning command:\e[0m #{formatted_command}" }
-          wrapper.call(-> { run })
-          debug { "\n" + divider('START') + output + divider('END') }
+          run_with_debugging
 
           if run_successfully && !success?
             fail!
@@ -108,7 +110,7 @@ module Tests
 
     def fail!
       raise <<-MESSAGE
-Command #{command.inspect} exited with status #{exit_status}.
+Command #{formatted_command.inspect} exited with status #{exit_status}.
 Output:
 #{divider('START') + output + divider('END')}
       MESSAGE
@@ -142,14 +144,24 @@ Output:
     end
 
     def run
-      Dir.chdir(directory) do
-        pid = spawn(env, *command, options)
-        Process.waitpid(pid)
-      end
-
+      pid = spawn(env, *command, options)
+      Process.waitpid(pid)
       @status = $?
     end
 
+    def run_with_wrapper
+      wrapper.call(method(:run))
+    end
+
+    def run_with_debugging
+      debug { "\n\e[33mChanging to directory:\e[0m #{directory}" }
+      debug { "\e[32mRunning command:\e[0m #{formatted_command}" }
+
+      run_with_wrapper
+
+      debug { "\n" + divider('START') + output + divider('END') }
+    end
+
     def possibly_running_quickly(&block)
       if run_quickly
         begin
@@ -160,7 +172,7 @@ Output:
           message =
             "Command timed out after #{timeout} seconds: #{formatted_command}\n" +
             "Output:\n" +
-            elided_output
+            output
 
           raise TimeoutError, message
         end