mirror of
				https://github.com/thoughtbot/shoulda-matchers.git
				synced 2022-11-09 12:01:38 -05:00 
			
		
		
		
	Update set_the_flash_matcher to also duplicate the used set to fix a bug in Rubinius
Tests now also passed on Rubinius 2.0
This commit is contained in:
		
							parent
							
								
									4450c865db
								
							
						
					
					
						commit
						3d9439030b
					
				
					 5 changed files with 12 additions and 9 deletions
				
			
		
							
								
								
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -10,3 +10,4 @@ tmp
 | 
			
		|||
.bundle
 | 
			
		||||
Gemfile.lock
 | 
			
		||||
gemfiles/*.lock
 | 
			
		||||
*.rbc
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,6 +3,7 @@ rvm:
 | 
			
		|||
  - 1.9.2
 | 
			
		||||
  - 1.9.3
 | 
			
		||||
  - ree
 | 
			
		||||
  - rbx-2.0
 | 
			
		||||
  - jruby
 | 
			
		||||
 | 
			
		||||
before_script:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,12 +3,12 @@
 | 
			
		|||
source "http://rubygems.org"
 | 
			
		||||
 | 
			
		||||
gem "rake", "~> 0.9.2"
 | 
			
		||||
gem "sqlite3", :platform=>:ruby
 | 
			
		||||
gem "activerecord-jdbc-adapter", :platform=>:jruby
 | 
			
		||||
gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 | 
			
		||||
gem "jdbc-sqlite3", :platform=>:jruby
 | 
			
		||||
gem "sqlite3", :platform=>:ruby
 | 
			
		||||
gem "jruby-openssl", :platform=>:jruby
 | 
			
		||||
gem "shoulda-context", "~> 1.0.0.beta1"
 | 
			
		||||
gem "activerecord-jdbc-adapter", :platform=>:jruby
 | 
			
		||||
gem "jdbc-sqlite3", :platform=>:jruby
 | 
			
		||||
gem "rails", "3.0.10"
 | 
			
		||||
 | 
			
		||||
gemspec :path=>"../"
 | 
			
		||||
| 
						 | 
				
			
			@ -3,16 +3,16 @@
 | 
			
		|||
source "http://rubygems.org"
 | 
			
		||||
 | 
			
		||||
gem "rake", "~> 0.9.2"
 | 
			
		||||
gem "sqlite3", :platform=>:ruby
 | 
			
		||||
gem "activerecord-jdbc-adapter", :platform=>:jruby
 | 
			
		||||
gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 | 
			
		||||
gem "jdbc-sqlite3", :platform=>:jruby
 | 
			
		||||
gem "sqlite3", :platform=>:ruby
 | 
			
		||||
gem "jruby-openssl", :platform=>:jruby
 | 
			
		||||
gem "shoulda-context", "~> 1.0.0.beta1"
 | 
			
		||||
gem "rails", "3.1.0"
 | 
			
		||||
gem "uglifier"
 | 
			
		||||
gem "jquery-rails"
 | 
			
		||||
gem "coffee-rails"
 | 
			
		||||
gem "uglifier"
 | 
			
		||||
gem "sass-rails"
 | 
			
		||||
gem "activerecord-jdbc-adapter", :platform=>:jruby
 | 
			
		||||
gem "jdbc-sqlite3", :platform=>:jruby
 | 
			
		||||
gem "jquery-rails"
 | 
			
		||||
gem "rails", "3.1.0"
 | 
			
		||||
 | 
			
		||||
gemspec :path=>"../"
 | 
			
		||||
| 
						 | 
				
			
			@ -68,6 +68,7 @@ module Shoulda # :nodoc:
 | 
			
		|||
        def flash
 | 
			
		||||
          return @flash if @flash
 | 
			
		||||
          @flash = @controller.flash.dup
 | 
			
		||||
          @flash.instance_variable_set(:@used, @controller.flash.instance_variable_get(:@used).dup)
 | 
			
		||||
          @flash.sweep unless @now
 | 
			
		||||
          @flash
 | 
			
		||||
        end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue