shoulda-matchers 2.7.0 → 2.8.0.rc1

data/gemfiles/4.2.gemfile

@@ -0,0 +1,36 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 1.0"
+gem "aruba"
+gem "bourne", "~> 1.3"
+gem "bundler", "~> 1.1"
+gem "pry"
+gem "rails", "~> 4.2.0"
+gem "rake", ">= 0.9.2"
+gem "rspec-rails", "~> 3.0.1"
+gem "yard"
+gem "redcarpet"
+gem "pygments.rb"
+gem "watchr"
+gem "shoulda-context", "~> 1.2.0"
+gem "sqlite3", :platform => :ruby
+gem "activerecord-jdbc-adapter", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+gem "jdbc-sqlite3", :platform => :jruby
+gem "jruby-openssl", :platform => :jruby
+gem "therubyrhino", :platform => :jruby
+gem "spring"
+gem "spring-commands-rspec"
+gem "uglifier", ">= 1.3.0"
+gem "coffee-rails", "~> 4.0.0"
+gem "jquery-rails"
+gem "turbolinks"
+gem "sdoc", "~> 0.4.0"
+gem "activeresource", "4.0.0"
+gem "protected_attributes", "~> 1.0.6"
+gem "minitest-reporters"
+gem "jbuilder", "~> 2.0"
+gem "sass-rails", "~> 5.0"
+gem "bcrypt", "~> 3.1.7"

data/gemfiles/4.2.gemfile.lock

@@ -0,0 +1,245 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.0)
+      activesupport (= 4.2.0)
+      globalid (>= 0.3.0)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
+      builder (~> 3.1)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activeresource (4.0.0)
+      activemodel (~> 4.0)
+      activesupport (~> 4.0)
+      rails-observers (~> 0.1.1)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    ansi (1.4.3)
+    appraisal (1.0.2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.0)
+    aruba (0.6.1)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    bcrypt (3.1.9)
+    bourne (1.6.0)
+      mocha (~> 1.1)
+    builder (3.2.2)
+    childprocess (0.5.5)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.0)
+    coffee-rails (4.0.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.8.0)
+    cucumber (1.3.17)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    execjs (2.2.2)
+    ffi (1.9.6)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    globalid (0.3.0)
+      activesupport (>= 4.1.0)
+    hike (1.2.3)
+    i18n (0.7.0)
+    jbuilder (2.2.6)
+      activesupport (>= 3.0.0, < 5)
+      multi_json (~> 1.2)
+    jquery-rails (4.0.2)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.1)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    metaclass (0.0.4)
+    method_source (0.8.2)
+    mime-types (2.4.3)
+    mini_portile (0.6.1)
+    minitest (5.5.0)
+    minitest-reporters (1.0.8)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    posix-spawn (0.3.9)
+    protected_attributes (1.0.8)
+      activemodel (>= 4.0.1, < 5.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pygments.rb (0.6.0)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.1.0)
+    rack (1.6.0)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.2.0)
+      actionmailer (= 4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      activemodel (= 4.2.0)
+      activerecord (= 4.2.0)
+      activesupport (= 4.2.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.0)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.1)
+      loofah (~> 2.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    rdoc (4.2.0)
+      json (~> 1.4)
+    redcarpet (3.2.2)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    ruby-progressbar (1.7.1)
+    sass (3.4.9)
+    sass-rails (5.0.0)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    shoulda-context (1.2.1)
+    slop (3.6.0)
+    spring (1.2.0)
+    spring-commands-rspec (1.0.4)
+      spring (>= 0.9.1)
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    turbolinks (2.5.3)
+      coffee-rails
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (2.6.0)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    watchr (0.7)
+    yajl-ruby (1.1.0)
+    yard (0.8.7.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
+  activeresource (= 4.0.0)
+  appraisal (~> 1.0)
+  aruba
+  bcrypt (~> 3.1.7)
+  bourne (~> 1.3)
+  bundler (~> 1.1)
+  coffee-rails (~> 4.0.0)
+  jbuilder (~> 2.0)
+  jdbc-sqlite3
+  jquery-rails
+  jruby-openssl
+  minitest-reporters
+  protected_attributes (~> 1.0.6)
+  pry
+  pygments.rb
+  rails (~> 4.2.0)
+  rake (>= 0.9.2)
+  redcarpet
+  rspec-rails (~> 3.0.1)
+  sass-rails (~> 5.0)
+  sdoc (~> 0.4.0)
+  shoulda-context (~> 1.2.0)
+  spring
+  spring-commands-rspec
+  sqlite3
+  therubyrhino
+  turbolinks
+  uglifier (>= 1.3.0)
+  watchr
+  yard

data/lib/shoulda/matchers.rb

@@ -1,9 +1,11 @@
 require 'shoulda/matchers/assertion_error'
 require 'shoulda/matchers/doublespeak'
 require 'shoulda/matchers/error'
+require 'shoulda/matchers/matcher_context'
 require 'shoulda/matchers/rails_shim'
-require 'shoulda/matchers/warn'
+require 'shoulda/matchers/util'
 require 'shoulda/matchers/version'
+require 'shoulda/matchers/warn'
 
 require 'shoulda/matchers/independent'
 

data/lib/shoulda/matchers/action_controller.rb

@@ -1,6 +1,6 @@
 require 'shoulda/matchers/action_controller/filter_param_matcher'
 require 'shoulda/matchers/action_controller/route_params'
-require 'shoulda/matchers/action_controller/set_the_flash_matcher'
+require 'shoulda/matchers/action_controller/set_flash_matcher'
 require 'shoulda/matchers/action_controller/render_with_layout_matcher'
 require 'shoulda/matchers/action_controller/respond_with_matcher'
 require 'shoulda/matchers/action_controller/set_session_matcher'

data/lib/shoulda/matchers/action_controller/redirect_to_matcher.rb

@@ -72,7 +72,7 @@ module Shoulda
         end
 
         def description
-          "redirect to #{@location}"
+          "redirect to #{@location.inspect}"
         end
 
         private

data/lib/shoulda/matchers/action_controller/route_params.rb

@@ -24,14 +24,19 @@ module Shoulda
         end
 
         def extract_params_from_string
-          params = args[1] || {}
           controller, action = args[0].split('#')
-          params.merge!(controller: controller, action: action)
+          params = (args[1] || {}).merge(controller: controller, action: action)
+          stringify_values(params)
         end
 
         def stringify_params
-          args[0].each do |key, value|
-            args[0][key] = stringify(value)
+          stringify_values(args[0])
+        end
+
+        def stringify_values(hash)
+          hash.inject({}) do |hash_copy, (key, value)|
+            hash_copy[key] = stringify(value)
+            hash_copy
           end
         end
 

data/lib/shoulda/matchers/action_controller/{set_the_flash_matcher.rb → set_flash_matcher.rb}

@@ -1,7 +1,7 @@
 module Shoulda
   module Matchers
     module ActionController
-      # The `set_the_flash` matcher is used to make assertions about the
+      # The `set_flash` matcher is used to make assertions about the
       # `flash` hash.
       #
       #     class PostsController < ApplicationController
@@ -18,13 +18,13 @@ module Shoulda
       #       describe 'GET #index' do
       #         before { get :index }
       #
-      #         it { should set_the_flash }
+      #         it { should set_flash }
       #       end
       #
       #       describe 'DELETE #destroy' do
       #         before { delete :destroy }
       #
-      #         it { should_not set_the_flash }
+      #         it { should_not set_flash }
       #       end
       #     end
       #
@@ -33,13 +33,13 @@ module Shoulda
       #       context 'GET #index' do
       #         setup { get :index }
       #
-      #         should set_the_flash
+      #         should set_flash
       #       end
       #
       #       context 'DELETE #destroy' do
       #         setup { delete :destroy }
       #
-      #         should_not set_the_flash
+      #         should_not set_flash
       #       end
       #     end
       #
@@ -60,8 +60,8 @@ module Shoulda
       #       describe 'GET #index' do
       #         before { get :index }
       #
-      #         it { should set_the_flash[:foo] }
-      #         it { should_not set_the_flash[:bar] }
+      #         it { should set_flash[:foo] }
+      #         it { should_not set_flash[:bar] }
       #       end
       #     end
       #
@@ -70,8 +70,8 @@ module Shoulda
       #       context 'GET #index' do
       #         setup { get :show }
       #
-      #         should set_the_flash[:foo]
-      #         should_not set_the_flash[:bar]
+      #         should set_flash[:foo]
+      #         should_not set_flash[:bar]
       #       end
       #     end
       #
@@ -91,10 +91,10 @@ module Shoulda
       #       describe 'GET #index' do
       #         before { get :index }
       #
-      #         it { should set_the_flash.to('A candy bar') }
-      #         it { should set_the_flash.to(/bar/) }
-      #         it { should set_the_flash[:foo].to('bar') }
-      #         it { should_not set_the_flash[:foo].to('something else') }
+      #         it { should set_flash.to('A candy bar') }
+      #         it { should set_flash.to(/bar/) }
+      #         it { should set_flash[:foo].to('bar') }
+      #         it { should_not set_flash[:foo].to('something else') }
       #       end
       #     end
       #
@@ -103,10 +103,10 @@ module Shoulda
       #       context 'GET #index' do
       #         setup { get :show }
       #
-      #         should set_the_flash.to('A candy bar')
-      #         should set_the_flash.to(/bar/)
-      #         should set_the_flash[:foo].to('bar')
-      #         should_not set_the_flash[:foo].to('something else')
+      #         should set_flash.to('A candy bar')
+      #         should set_flash.to(/bar/)
+      #         should set_flash[:foo].to('bar')
+      #         should_not set_flash[:foo].to('something else')
       #       end
       #     end
       #
@@ -126,9 +126,9 @@ module Shoulda
       #       describe 'GET #show' do
       #         before { get :show }
       #
-      #         it { should set_the_flash.now }
-      #         it { should set_the_flash[:foo].now }
-      #         it { should set_the_flash[:foo].to('bar').now }
+      #         it { should set_flash.now }
+      #         it { should set_flash[:foo].now }
+      #         it { should set_flash[:foo].to('bar').now }
       #       end
       #     end
       #
@@ -137,20 +137,28 @@ module Shoulda
       #       context 'GET #index' do
       #         setup { get :show }
       #
-      #         should set_the_flash.now
-      #         should set_the_flash[:foo].now
-      #         should set_the_flash[:foo].to('bar').now
+      #         should set_flash.now
+      #         should set_flash[:foo].now
+      #         should set_flash[:foo].to('bar').now
       #       end
       #     end
       #
-      # @return [SetTheFlashMatcher]
+      # @return [SetFlashMatcher]
       #
+      def set_flash
+        SetFlashMatcher.new
+      end
+
       def set_the_flash
-        SetTheFlashMatcher.new
+        Shoulda::Matchers.warn_about_deprecated_method(
+          :set_the_flash,
+          :set_flash
+        )
+        set_flash
       end
 
       # @private
-      class SetTheFlashMatcher
+      class SetFlashMatcher
         def initialize
           @options = {}
           @value = nil