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

Update rspec

Browse source
This commit is contained in:
Raphael Sofaer 2011-05-13 17:47:15 -07:00
parent 92bef09455
commit 70fd2e916a
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Gemfile.lock
View file

@ -333,20 +333,20 @@ GEM
vegas (~> 0.1.2) vegas (~> 0.1.2)
rest-client (1.6.1) rest-client (1.6.1)
mime-types (>= 1.16) mime-types (>= 1.16)
rspec (2.5.0) rspec (2.6.0)
rspec-core (~> 2.5.0) rspec-core (~> 2.6.0)
rspec-expectations (~> 2.5.0) rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.5.0) rspec-mocks (~> 2.6.0)
rspec-core (2.5.1) rspec-core (2.6.0)
rspec-expectations (2.5.0) rspec-expectations (2.6.0)
diff-lcs (~> 1.1.2) diff-lcs (~> 1.1.2)
rspec-instafail (0.1.7) rspec-instafail (0.1.7)
rspec-mocks (2.5.0) rspec-mocks (2.6.0)
rspec-rails (2.5.0) rspec-rails (2.6.0)
actionpack (~> 3.0) actionpack (~> 3.0)
activesupport (~> 3.0) activesupport (~> 3.0)
railties (~> 3.0) railties (~> 3.0)
rspec (~> 2.5.0) rspec (~> 2.6.0)
ruby-debug (0.10.4) ruby-debug (0.10.4)
columnize (>= 0.1) columnize (>= 0.1)
ruby-debug-base (~> 0.10.4.0) ruby-debug-base (~> 0.10.4.0)
@ -384,7 +384,7 @@ GEM
typhoeus (0.2.4) typhoeus (0.2.4)
mime-types mime-types
mime-types mime-types
tzinfo (0.3.26) tzinfo (0.3.27)
uuidtools (2.1.2) uuidtools (2.1.2)
vegas (0.1.8) vegas (0.1.8)
rack (>= 1.0.0) rack (>= 1.0.0)

2
lib/tasks/rspec.rake
View file

@ -16,7 +16,7 @@ begin
RSpec::Core::RakeTask.new(:spec => spec_prereq) RSpec::Core::RakeTask.new(:spec => spec_prereq)
desc "Run the specs with rcov" desc "Run the specs with rcov"
Rspec::Core::RakeTask.new(:rcov => spec_prereq) do |t| RSpec::Core::RakeTask.new(:rcov => spec_prereq) do |t|
t.rcov = true t.rcov = true
t.rcov_opts = ['-Ispec', '--exclude', 'spec', '--exclude', 'gems'] t.rcov_opts = ['-Ispec', '--exclude', 'spec', '--exclude', 'gems']
end end

2
spec/models/user/posting_spec.rb
View file

@ -48,7 +48,7 @@ describe User do
it 'returns a list of all valid aspects a user can post to' do it 'returns a list of all valid aspects a user can post to' do
aspect_ids = Aspect.all.map(&:id) aspect_ids = Aspect.all.map(&:id)
user.aspects_from_ids(aspect_ids).map{|a| a}.should == user.aspects_from_ids(aspect_ids).map{|a| a}.should ==
user.aspects.map{|a| a} #Rspec matchers ftw user.aspects.map{|a| a} #RSpec matchers ftw
end end
it "lets you post to your own aspects" do it "lets you post to your own aspects" do
user.aspects_from_ids([aspect.id]).should == [aspect] user.aspects_from_ids([aspect.id]).should == [aspect]

8
spec/spec_helper.rb
View file

@ -24,10 +24,6 @@ support_files = Dir["#{File.dirname(__FILE__)}/support/**/*.rb"] - [fixture_buil
support_files.each {|f| require f } support_files.each {|f| require f }
require fixture_builder_file require fixture_builder_file
Dir["#{File.dirname(__FILE__)}/shared_behaviors/**/*.rb"].each do |f|
require f
end
RSpec.configure do |config| RSpec.configure do |config|
config.include Devise::TestHelpers, :type => :controller config.include Devise::TestHelpers, :type => :controller
config.mock_with :rspec config.mock_with :rspec
@ -50,6 +46,10 @@ RSpec.configure do |config|
end end
end end
Dir["#{File.dirname(__FILE__)}/shared_behaviors/**/*.rb"].each do |f|
require f
end
disable_typhoeus disable_typhoeus
ProcessedImage.enable_processing = false ProcessedImage.enable_processing = false

2
spec/support/fixture_generation.rb
View file

@ -1,4 +1,4 @@
Rspec::Rails::ControllerExampleGroup.class_eval do RSpec::Rails::ControllerExampleGroup.class_eval do
# Saves the markup to a fixture file using the given name # Saves the markup to a fixture file using the given name
def save_fixture(markup, name, fixture_path=nil ) def save_fixture(markup, name, fixture_path=nil )