Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update RSpec to 2.1

  • Loading branch information...
commit 6a3a5fc24caafacbf0f6703bcc15758ed7391dcf 1 parent 695eb22
Jeff Kreeftmeijer authored
Showing with 53 additions and 55 deletions.
  1. +45 −37 Gemfile.lock
  2. +6 −12 Rakefile
  3. +1 −1  navvy.gemspec
  4. +1 −5 spec/spec_helper.rb
82 Gemfile.lock
View
@@ -6,25 +6,26 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- activerecord (2.3.8)
- activesupport (= 2.3.8)
- activesupport (2.3.8)
- addressable (2.2.0)
- bson (1.0.4)
- bson_ext (1.0.4)
+ activerecord (2.3.10)
+ activesupport (= 2.3.10)
+ activesupport (2.3.10)
+ addressable (2.2.2)
+ bson (1.0)
+ bson_ext (1.1.2)
builder (2.1.2)
data_objects (0.10.2)
addressable (~> 2.1)
- dm-core (1.0.0)
- addressable (~> 2.1)
+ diff-lcs (1.1.2)
+ dm-core (1.0.2)
+ addressable (~> 2.2)
extlib (~> 0.9.15)
- dm-do-adapter (1.0.0)
- data_objects (~> 0.10.1)
- dm-core (~> 1.0.0)
- dm-migrations (1.0.0)
- dm-core (~> 1.0.0)
- dm-sqlite-adapter (1.0.0)
- dm-do-adapter (~> 1.0.0)
+ dm-do-adapter (1.0.2)
+ data_objects (~> 0.10.2)
+ dm-core (~> 1.0.2)
+ dm-migrations (1.0.2)
+ dm-core (~> 1.0.2)
+ dm-sqlite-adapter (1.0.2)
+ dm-do-adapter (~> 1.0.2)
do_sqlite3 (~> 0.10.2)
do_sqlite3 (0.10.2)
data_objects (= 0.10.2)
@@ -32,44 +33,51 @@ GEM
extlib (0.9.15)
jnunemaker-validatable (1.8.4)
activesupport (>= 2.3.4)
- mongo (1.0.7)
- bson (>= 1.0.4)
- mongo_mapper (0.8.3)
+ leshill-will_paginate (2.3.11)
+ mongo (1.0)
+ bson (= 1.0)
+ mongo_mapper (0.7.6)
activesupport (>= 2.3.4)
- jnunemaker-validatable (~> 1.8.4)
- plucky (~> 0.3.3)
- mongoid (1.9.1)
- activesupport (<= 3.0.0)
- bson (~> 1.0.1)
+ jnunemaker-validatable (= 1.8.4)
+ mongo (= 1.0)
+ plucky (= 0.1.1)
+ mongoid (1.0.6)
+ activesupport (>= 2.2.2)
durran-validatable (>= 2.0.1)
- mongo (~> 1.0.1)
- will_paginate (< 2.9)
- plucky (0.3.4)
- mongo (~> 1.0.7)
+ leshill-will_paginate (>= 2.3.11)
+ mongo (>= 0.18.2)
+ plucky (0.1.1)
+ mongo (= 1.0)
rake (0.8.7)
- rspec (1.3.0)
- sequel (3.14.0)
- sqlite3-ruby (1.3.1)
+ rspec (2.1.0)
+ rspec-core (~> 2.1.0)
+ rspec-expectations (~> 2.1.0)
+ rspec-mocks (~> 2.1.0)
+ rspec-core (2.1.0)
+ rspec-expectations (2.1.0)
+ diff-lcs (~> 1.1.2)
+ rspec-mocks (2.1.0)
+ sequel (3.17.0)
+ sqlite3-ruby (1.3.2)
timecop (0.3.5)
- tzinfo (0.3.22)
- will_paginate (2.3.14)
- yard (0.5.8)
+ tzinfo (0.3.23)
+ yard (0.6.1)
PLATFORMS
ruby
DEPENDENCIES
- activerecord (>= 2.3.5)
+ activerecord (~> 2.3.5)
bson_ext
builder
- dm-core (>= 1.0.0)
+ dm-core (~> 1.0.0)
dm-migrations
dm-sqlite-adapter
- mongo_mapper (>= 0.7.0)
+ mongo_mapper (~> 0.7.0)
mongoid
navvy!
rake
- rspec (>= 1.2.9)
+ rspec (~> 2.1.0)
sequel (>= 3.8.0)
sqlite3-ruby
timecop (>= 0.3.5)
18 Rakefile
View
@@ -1,29 +1,23 @@
require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
adapters = Dir[File.dirname(__FILE__) + '/lib/navvy/job/*.rb'].map{|file| File.basename(file, '.rb') }
-task :spec do
+task :rspec do
adapters.map{|adapter| "spec:#{adapter}"}.each do |spec|
Rake::Task[spec].invoke
end
end
-namespace :spec do
+namespace :rspec do
adapters.each do |adapter|
- Spec::Rake::SpecTask.new(adapter) do |spec|
- spec.spec_files = FileList["spec/setup/#{adapter}.rb", 'spec/*_spec.rb']
+ RSpec::Core::RakeTask.new(adapter) do |spec|
+ spec.pattern = "spec/setup/#{adapter}.rb", 'spec/*_spec.rb'
end
end
end
-Spec::Rake::SpecTask.new(:rcov) do |spec|
- spec.libs << 'lib' << 'spec'
- spec.pattern = 'spec/**/*_spec.rb'
- spec.rcov = true
-end
-
-task :default => :spec
+task :default => :rspec
begin
require 'yard'
2  navvy.gemspec
View
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
gem.add_development_dependency('rake')
gem.add_development_dependency('sqlite3-ruby')
gem.add_development_dependency('bson_ext')
- gem.add_development_dependency('rspec', [">= 1.2.9"])
+ gem.add_development_dependency('rspec', ["~> 2.1.0"])
gem.add_development_dependency('yard', [">= 0.5.2"])
gem.add_development_dependency('timecop', [">= 0.3.5"])
end
6 spec/spec_helper.rb
View
@@ -1,12 +1,8 @@
$LOAD_PATH.unshift(File.dirname(__FILE__))
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
require 'navvy'
-require 'spec'
+require 'rspec'
require 'timecop'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-end
def job_count
if defined? Navvy::Job.count
Please sign in to comment.
Something went wrong with that request. Please try again.