nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing merge with master

Browse source
This commit is contained in:
maxwell 2010-06-19 14:57:37 -07:00
commit 1e0e0bce79
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -11,6 +11,7 @@ gem "haml"
gem "devise", :git => "git://github.com/plataformatec/devise.git" gem "devise", :git => "git://github.com/plataformatec/devise.git"
gem 'roxml', :git => "git://github.com/Empact/roxml.git" gem 'roxml', :git => "git://github.com/Empact/roxml.git"
group :test do group :test do
gem 'rspec', '>= 2.0.0.beta.12' gem 'rspec', '>= 2.0.0.beta.12'
gem 'rspec-rails', ">= 2.0.0.beta.8" gem 'rspec-rails', ">= 2.0.0.beta.8"

4
spec/spec_helper.rb
View file

@ -16,7 +16,7 @@ Rspec.configure do |config|
# #
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line: # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
#this is a dumb hax TODO #this is a dumb hax TODO
config.mock_with :mocha #config.mock_with :mocha
# config.mock_with :flexmock # config.mock_with :flexmock
# config.mock_with :rr # config.mock_with :rr
config.mock_with :rspec config.mock_with :rspec
@ -41,5 +41,5 @@ Rspec.configure do |config|
# If you're not using ActiveRecord, or you'd prefer not to run each of your # If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, comment the following line or assign false # examples within a transaction, comment the following line or assign false
# instead of true. # instead of true.
config.use_transactional_fixtures = false config.use_transactional_fixtures = true
end end