mirror of
				https://github.com/thoughtbot/shoulda-matchers.git
				synced 2022-11-09 12:01:38 -05:00 
			
		
		
		
	Upgrade RSpec to v3.4
v3.3 introduced a new feature: the ability to re-run failed specs. v3.4 contains some other nifty features, such as code highlighting and compound failure messages.
This commit is contained in:
		
							parent
							
								
									6b3253147a
								
							
						
					
					
						commit
						97a627c273
					
				
					 7 changed files with 100 additions and 82 deletions
				
			
		
							
								
								
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -8,4 +8,5 @@ build
 | 
			
		|||
doc
 | 
			
		||||
pkg
 | 
			
		||||
source
 | 
			
		||||
spec/examples.txt
 | 
			
		||||
tmp
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										25
									
								
								Gemfile.lock
									
										
									
									
									
								
							
							
						
						
									
										25
									
								
								Gemfile.lock
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -30,19 +30,19 @@ GEM
 | 
			
		|||
      yajl-ruby (~> 1.1.0)
 | 
			
		||||
    rake (10.4.2)
 | 
			
		||||
    redcarpet (3.0.0)
 | 
			
		||||
    rspec (3.3.0)
 | 
			
		||||
      rspec-core (~> 3.3.0)
 | 
			
		||||
      rspec-expectations (~> 3.3.0)
 | 
			
		||||
      rspec-mocks (~> 3.3.0)
 | 
			
		||||
    rspec-core (3.3.2)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-expectations (3.3.1)
 | 
			
		||||
    rspec (3.4.0)
 | 
			
		||||
      rspec-core (~> 3.4.0)
 | 
			
		||||
      rspec-expectations (~> 3.4.0)
 | 
			
		||||
      rspec-mocks (~> 3.4.0)
 | 
			
		||||
    rspec-core (3.4.1)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-expectations (3.4.0)
 | 
			
		||||
      diff-lcs (>= 1.2.0, < 2.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-mocks (3.3.2)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-mocks (3.4.0)
 | 
			
		||||
      diff-lcs (>= 1.2.0, < 2.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-support (3.3.0)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-support (3.4.1)
 | 
			
		||||
    slop (3.6.0)
 | 
			
		||||
    thor (0.19.1)
 | 
			
		||||
    yajl-ruby (1.1.0)
 | 
			
		||||
| 
						 | 
				
			
			@ -65,3 +65,6 @@ DEPENDENCIES
 | 
			
		|||
  rspec (~> 3.2)
 | 
			
		||||
  yard
 | 
			
		||||
  zeus
 | 
			
		||||
 | 
			
		||||
BUNDLED WITH
 | 
			
		||||
   1.11.1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -118,27 +118,27 @@ GEM
 | 
			
		|||
    rake (10.4.2)
 | 
			
		||||
    rdoc (4.2.0)
 | 
			
		||||
    redcarpet (3.3.2)
 | 
			
		||||
    rspec (3.3.0)
 | 
			
		||||
      rspec-core (~> 3.3.0)
 | 
			
		||||
      rspec-expectations (~> 3.3.0)
 | 
			
		||||
      rspec-mocks (~> 3.3.0)
 | 
			
		||||
    rspec-core (3.3.2)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-expectations (3.3.1)
 | 
			
		||||
    rspec (3.4.0)
 | 
			
		||||
      rspec-core (~> 3.4.0)
 | 
			
		||||
      rspec-expectations (~> 3.4.0)
 | 
			
		||||
      rspec-mocks (~> 3.4.0)
 | 
			
		||||
    rspec-core (3.4.1)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-expectations (3.4.0)
 | 
			
		||||
      diff-lcs (>= 1.2.0, < 2.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-mocks (3.3.2)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-mocks (3.4.0)
 | 
			
		||||
      diff-lcs (>= 1.2.0, < 2.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-rails (3.3.3)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-rails (3.4.0)
 | 
			
		||||
      actionpack (>= 3.0, < 4.3)
 | 
			
		||||
      activesupport (>= 3.0, < 4.3)
 | 
			
		||||
      railties (>= 3.0, < 4.3)
 | 
			
		||||
      rspec-core (~> 3.3.0)
 | 
			
		||||
      rspec-expectations (~> 3.3.0)
 | 
			
		||||
      rspec-mocks (~> 3.3.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-support (3.3.0)
 | 
			
		||||
      rspec-core (~> 3.4.0)
 | 
			
		||||
      rspec-expectations (~> 3.4.0)
 | 
			
		||||
      rspec-mocks (~> 3.4.0)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-support (3.4.1)
 | 
			
		||||
    sass (3.2.19)
 | 
			
		||||
    sass-rails (4.0.5)
 | 
			
		||||
      railties (>= 4.0.0, < 5.0)
 | 
			
		||||
| 
						 | 
				
			
			@ -171,7 +171,7 @@ GEM
 | 
			
		|||
      polyglot (>= 0.3.1)
 | 
			
		||||
    turbolinks (2.5.3)
 | 
			
		||||
      coffee-rails
 | 
			
		||||
    tzinfo (0.3.44)
 | 
			
		||||
    tzinfo (0.3.46)
 | 
			
		||||
    uglifier (2.7.2)
 | 
			
		||||
      execjs (>= 0.3.0)
 | 
			
		||||
      json (>= 1.8.0)
 | 
			
		||||
| 
						 | 
				
			
			@ -218,3 +218,6 @@ DEPENDENCIES
 | 
			
		|||
  uglifier (>= 1.3.0)
 | 
			
		||||
  yard
 | 
			
		||||
  zeus
 | 
			
		||||
 | 
			
		||||
BUNDLED WITH
 | 
			
		||||
   1.11.1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -120,27 +120,27 @@ GEM
 | 
			
		|||
    rake (10.4.2)
 | 
			
		||||
    rdoc (4.2.0)
 | 
			
		||||
    redcarpet (3.3.2)
 | 
			
		||||
    rspec (3.3.0)
 | 
			
		||||
      rspec-core (~> 3.3.0)
 | 
			
		||||
      rspec-expectations (~> 3.3.0)
 | 
			
		||||
      rspec-mocks (~> 3.3.0)
 | 
			
		||||
    rspec-core (3.3.2)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-expectations (3.3.1)
 | 
			
		||||
    rspec (3.4.0)
 | 
			
		||||
      rspec-core (~> 3.4.0)
 | 
			
		||||
      rspec-expectations (~> 3.4.0)
 | 
			
		||||
      rspec-mocks (~> 3.4.0)
 | 
			
		||||
    rspec-core (3.4.1)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-expectations (3.4.0)
 | 
			
		||||
      diff-lcs (>= 1.2.0, < 2.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-mocks (3.3.2)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-mocks (3.4.0)
 | 
			
		||||
      diff-lcs (>= 1.2.0, < 2.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-rails (3.3.3)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-rails (3.4.0)
 | 
			
		||||
      actionpack (>= 3.0, < 4.3)
 | 
			
		||||
      activesupport (>= 3.0, < 4.3)
 | 
			
		||||
      railties (>= 3.0, < 4.3)
 | 
			
		||||
      rspec-core (~> 3.3.0)
 | 
			
		||||
      rspec-expectations (~> 3.3.0)
 | 
			
		||||
      rspec-mocks (~> 3.3.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-support (3.3.0)
 | 
			
		||||
      rspec-core (~> 3.4.0)
 | 
			
		||||
      rspec-expectations (~> 3.4.0)
 | 
			
		||||
      rspec-mocks (~> 3.4.0)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-support (3.4.1)
 | 
			
		||||
    sass (3.2.19)
 | 
			
		||||
    sass-rails (4.0.5)
 | 
			
		||||
      railties (>= 4.0.0, < 5.0)
 | 
			
		||||
| 
						 | 
				
			
			@ -173,7 +173,7 @@ GEM
 | 
			
		|||
      polyglot (>= 0.3.1)
 | 
			
		||||
    turbolinks (2.5.3)
 | 
			
		||||
      coffee-rails
 | 
			
		||||
    tzinfo (0.3.44)
 | 
			
		||||
    tzinfo (0.3.46)
 | 
			
		||||
    uglifier (2.7.2)
 | 
			
		||||
      execjs (>= 0.3.0)
 | 
			
		||||
      json (>= 1.8.0)
 | 
			
		||||
| 
						 | 
				
			
			@ -220,3 +220,6 @@ DEPENDENCIES
 | 
			
		|||
  uglifier (>= 1.3.0)
 | 
			
		||||
  yard
 | 
			
		||||
  zeus
 | 
			
		||||
 | 
			
		||||
BUNDLED WITH
 | 
			
		||||
   1.11.1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -76,7 +76,7 @@ GEM
 | 
			
		|||
      mime-types (>= 1.16, < 3)
 | 
			
		||||
    method_source (0.8.2)
 | 
			
		||||
    mime-types (2.6.2)
 | 
			
		||||
    minitest (5.8.1)
 | 
			
		||||
    minitest (5.8.3)
 | 
			
		||||
    minitest-reporters (1.1.2)
 | 
			
		||||
      ansi
 | 
			
		||||
      builder
 | 
			
		||||
| 
						 | 
				
			
			@ -116,27 +116,27 @@ GEM
 | 
			
		|||
    rake (10.4.2)
 | 
			
		||||
    rdoc (4.2.0)
 | 
			
		||||
    redcarpet (3.3.2)
 | 
			
		||||
    rspec (3.3.0)
 | 
			
		||||
      rspec-core (~> 3.3.0)
 | 
			
		||||
      rspec-expectations (~> 3.3.0)
 | 
			
		||||
      rspec-mocks (~> 3.3.0)
 | 
			
		||||
    rspec-core (3.3.2)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-expectations (3.3.1)
 | 
			
		||||
    rspec (3.4.0)
 | 
			
		||||
      rspec-core (~> 3.4.0)
 | 
			
		||||
      rspec-expectations (~> 3.4.0)
 | 
			
		||||
      rspec-mocks (~> 3.4.0)
 | 
			
		||||
    rspec-core (3.4.1)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-expectations (3.4.0)
 | 
			
		||||
      diff-lcs (>= 1.2.0, < 2.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-mocks (3.3.2)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-mocks (3.4.0)
 | 
			
		||||
      diff-lcs (>= 1.2.0, < 2.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-rails (3.3.3)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-rails (3.4.0)
 | 
			
		||||
      actionpack (>= 3.0, < 4.3)
 | 
			
		||||
      activesupport (>= 3.0, < 4.3)
 | 
			
		||||
      railties (>= 3.0, < 4.3)
 | 
			
		||||
      rspec-core (~> 3.3.0)
 | 
			
		||||
      rspec-expectations (~> 3.3.0)
 | 
			
		||||
      rspec-mocks (~> 3.3.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-support (3.3.0)
 | 
			
		||||
      rspec-core (~> 3.4.0)
 | 
			
		||||
      rspec-expectations (~> 3.4.0)
 | 
			
		||||
      rspec-mocks (~> 3.4.0)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-support (3.4.1)
 | 
			
		||||
    ruby-progressbar (1.7.5)
 | 
			
		||||
    sass (3.2.19)
 | 
			
		||||
    sass-rails (4.0.5)
 | 
			
		||||
| 
						 | 
				
			
			@ -215,3 +215,6 @@ DEPENDENCIES
 | 
			
		|||
  uglifier (>= 1.3.0)
 | 
			
		||||
  yard
 | 
			
		||||
  zeus
 | 
			
		||||
 | 
			
		||||
BUNDLED WITH
 | 
			
		||||
   1.11.1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -89,16 +89,16 @@ GEM
 | 
			
		|||
      mime-types (>= 1.16, < 3)
 | 
			
		||||
    method_source (0.8.2)
 | 
			
		||||
    mime-types (2.6.2)
 | 
			
		||||
    mini_portile (0.6.2)
 | 
			
		||||
    minitest (5.8.1)
 | 
			
		||||
    mini_portile2 (2.0.0)
 | 
			
		||||
    minitest (5.8.3)
 | 
			
		||||
    minitest-reporters (1.1.2)
 | 
			
		||||
      ansi
 | 
			
		||||
      builder
 | 
			
		||||
      minitest (>= 5.0)
 | 
			
		||||
      ruby-progressbar
 | 
			
		||||
    multi_json (1.11.2)
 | 
			
		||||
    nokogiri (1.6.6.2)
 | 
			
		||||
      mini_portile (~> 0.6.0)
 | 
			
		||||
    nokogiri (1.6.7.1)
 | 
			
		||||
      mini_portile2 (~> 2.0.0.rc2)
 | 
			
		||||
    pg (0.18.3)
 | 
			
		||||
    posix-spawn (0.3.11)
 | 
			
		||||
    protected_attributes (1.0.9)
 | 
			
		||||
| 
						 | 
				
			
			@ -141,27 +141,27 @@ GEM
 | 
			
		|||
    rake (10.4.2)
 | 
			
		||||
    rdoc (4.2.0)
 | 
			
		||||
    redcarpet (3.3.2)
 | 
			
		||||
    rspec (3.3.0)
 | 
			
		||||
      rspec-core (~> 3.3.0)
 | 
			
		||||
      rspec-expectations (~> 3.3.0)
 | 
			
		||||
      rspec-mocks (~> 3.3.0)
 | 
			
		||||
    rspec-core (3.3.2)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-expectations (3.3.1)
 | 
			
		||||
    rspec (3.4.0)
 | 
			
		||||
      rspec-core (~> 3.4.0)
 | 
			
		||||
      rspec-expectations (~> 3.4.0)
 | 
			
		||||
      rspec-mocks (~> 3.4.0)
 | 
			
		||||
    rspec-core (3.4.1)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-expectations (3.4.0)
 | 
			
		||||
      diff-lcs (>= 1.2.0, < 2.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-mocks (3.3.2)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-mocks (3.4.0)
 | 
			
		||||
      diff-lcs (>= 1.2.0, < 2.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-rails (3.3.3)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-rails (3.4.0)
 | 
			
		||||
      actionpack (>= 3.0, < 4.3)
 | 
			
		||||
      activesupport (>= 3.0, < 4.3)
 | 
			
		||||
      railties (>= 3.0, < 4.3)
 | 
			
		||||
      rspec-core (~> 3.3.0)
 | 
			
		||||
      rspec-expectations (~> 3.3.0)
 | 
			
		||||
      rspec-mocks (~> 3.3.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-support (3.3.0)
 | 
			
		||||
      rspec-core (~> 3.4.0)
 | 
			
		||||
      rspec-expectations (~> 3.4.0)
 | 
			
		||||
      rspec-mocks (~> 3.4.0)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-support (3.4.1)
 | 
			
		||||
    ruby-progressbar (1.7.5)
 | 
			
		||||
    sass (3.4.18)
 | 
			
		||||
    sass-rails (5.0.4)
 | 
			
		||||
| 
						 | 
				
			
			@ -238,3 +238,6 @@ DEPENDENCIES
 | 
			
		|||
  uglifier (>= 1.3.0)
 | 
			
		||||
  yard
 | 
			
		||||
  zeus
 | 
			
		||||
 | 
			
		||||
BUNDLED WITH
 | 
			
		||||
   1.11.1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,6 +14,8 @@ RSpec.configure do |config|
 | 
			
		|||
    config.infer_spec_type_from_file_location!
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  config.example_status_persistence_file_path = "spec/examples.txt"
 | 
			
		||||
 | 
			
		||||
  config.before(:all, type: :controller) do
 | 
			
		||||
    self.class.controller(ApplicationController) { }
 | 
			
		||||
  end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue