Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Migrate to Rspec 2

  • Loading branch information...
commit 8289e5b331f4818a7e675d733d9d636d786606ff 1 parent b255eaf
@kaluznyo kaluznyo authored
Showing with 37 additions and 32 deletions.
  1. +3 −0  Gemfile
  2. +8 −8 Rakefile
  3. +2 −0  discogs.gemspec
  4. +1 −1  spec/resource_spec.rb
  5. +1 −1  spec/resources/artist_release_spec.rb
  6. +1 −1  spec/resources/artist_spec.rb
  7. +1 −1  spec/resources/format_spec.rb
  8. +1 −1  spec/resources/generic_list_spec.rb
  9. +1 −1  spec/resources/image_spec.rb
  10. +1 −1  spec/resources/label_release_spec.rb
  11. +1 −1  spec/resources/label_spec.rb
  12. +1 −1  spec/resources/master_release_spec.rb
  13. +1 −1  spec/resources/master_release_version_spec.rb
  14. +1 −1  spec/resources/release_artist_spec.rb
  15. +1 −1  spec/resources/release_label_spec.rb
  16. +1 −1  spec/resources/release_spec.rb
  17. +1 −1  spec/resources/search_result_spec.rb
  18. +1 −1  spec/resources/search_spec.rb
  19. +1 −1  spec/resources/track_spec.rb
  20. +1 −1  spec/resources/video_spec.rb
  21. +1 −1  spec/spec_helper.rb
  22. +1 −1  spec/wrapper_methods/get_artist_spec.rb
  23. +1 −1  spec/wrapper_methods/get_label_spec.rb
  24. +1 −1  spec/wrapper_methods/get_master_release_spec.rb
  25. +1 −1  spec/wrapper_methods/get_release_spec.rb
  26. +1 −1  spec/wrapper_methods/search_spec.rb
  27. +1 −1  spec/wrapper_spec.rb
View
3  Gemfile
@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec
View
16 Rakefile
@@ -1,20 +1,20 @@
require 'rake'
-require 'spec'
-require 'spec/rake/spectask'
+require 'rspec'
+require 'rspec/core/rake_task'
require 'rake/gempackagetask'
task :default => :spec
desc "Run all specs in spec directory"
-Spec::Rake::SpecTask.new(:spec) do |t|
- t.spec_opts = ["--colour", "--format progress", "--loadby mtime", "--reverse"]
- t.spec_files = FileList[ 'spec/**/*_spec.rb' ]
+RSpec::Core::RakeTask.new(:spec) do |t|
+ t.rspec_opts = ["--colour"]
+ t.pattern = 'spec/**/*_spec.rb'
end
desc "Run all specs and generate RCov report"
-Spec::Rake::SpecTask.new('cov') do |t|
- t.spec_files = FileList['spec/**/*.rb']
- t.spec_opts = ["--colour"]
+RSpec::Core::RakeTask.new('cov') do |t|
+ t.pattern = 'spec/**/*.rb'
+ t.rspec_opts = ["--colour"]
t.rcov = true
t.rcov_opts = ['-T --no-html --exclude', 'spec\/,gems\/']
end
View
2  discogs.gemspec
@@ -15,5 +15,7 @@ Gem::Specification.new do |s|
s.test_files = ["spec/wrapper_methods/get_release_spec.rb", "spec/wrapper_methods/get_master_release_spec.rb", "spec/wrapper_methods/search_spec.rb", "spec/wrapper_methods/get_artist_spec.rb", "spec/wrapper_methods/get_label_spec.rb", "spec/resource_spec.rb", "spec/resources/label_spec.rb", "spec/resources/generic_list_spec.rb", "spec/resources/artist_release_spec.rb", "spec/resources/artist_spec.rb", "spec/resources/release_artist_spec.rb", "spec/resources/search_spec.rb", "spec/resources/label_release_spec.rb", "spec/resources/release_label_spec.rb", "spec/resources/release_spec.rb", "spec/resources/master_release_spec.rb", "spec/resources/master_release_version_spec.rb", "spec/resources/video_spec.rb", "spec/resources/search_result_spec.rb", "spec/resources/image_spec.rb", "spec/resources/track_spec.rb", "spec/resources/format_spec.rb", "spec/wrapper_spec.rb", "spec/spec_helper.rb"]
s.platform = Gem::Platform::RUBY
+
+ s.add_development_dependency "rspec", "= 2.12.0"
end
View
2  spec/resource_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require 'spec_helper'
describe Discogs::Resource do
View
2  spec/resources/artist_release_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Artist::Release do
View
2  spec/resources/artist_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Artist do
View
2  spec/resources/format_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Release::Format do
View
2  spec/resources/generic_list_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::GenericList do
View
2  spec/resources/image_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Image do
View
2  spec/resources/label_release_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Label::Release do
View
2  spec/resources/label_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Label do
View
2  spec/resources/master_release_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::MasterRelease do
View
2  spec/resources/master_release_version_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::MasterRelease::Version do
View
2  spec/resources/release_artist_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Release::Artist do
View
2  spec/resources/release_label_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Release::Label do
View
2  spec/resources/release_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Release do
View
2  spec/resources/search_result_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Search::Result do
View
2  spec/resources/search_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Search do
View
2  spec/resources/track_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Release::Track do
View
2  spec/resources/video_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Video do
View
2  spec/spec_helper.rb
@@ -1,5 +1,5 @@
require 'rubygems'
-require 'spec'
+require 'rspec'
require File.dirname(__FILE__) + '/../lib/discogs'
def valid_release_xml
View
2  spec/wrapper_methods/get_artist_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Wrapper do
View
2  spec/wrapper_methods/get_label_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Wrapper do
View
2  spec/wrapper_methods/get_master_release_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Wrapper do
View
2  spec/wrapper_methods/get_release_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Wrapper do
View
2  spec/wrapper_methods/search_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
describe Discogs::Wrapper do
View
2  spec/wrapper_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require 'spec_helper'
describe Discogs::Wrapper do

0 comments on commit 8289e5b

Please sign in to comment.
Something went wrong with that request. Please try again.