Skip to content

Commit 9542636

Browse files
committed
Convert to rspec 2.0
1 parent a9c889a commit 9542636

File tree

5 files changed

+20
-22
lines changed

5 files changed

+20
-22
lines changed

Gemfile

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
source "http://rubygems.org"
22

3-
gem "activeresource"
4-
gem "activesupport"
3+
gem "activeresource", "~>3.0.0"
54

6-
# gem "rails"
75
group :test do
8-
gem "rspec", '1.3.0'
6+
gem "rspec", "~>2.0.0"
97
end

Gemfile.lock

+13-4
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,22 @@ GEM
1010
activesupport (= 3.0.0)
1111
activesupport (3.0.0)
1212
builder (2.1.2)
13+
diff-lcs (1.1.2)
1314
i18n (0.4.1)
14-
rspec (1.3.0)
15+
rspec (2.0.0)
16+
rspec-core (= 2.0.0)
17+
rspec-expectations (= 2.0.0)
18+
rspec-mocks (= 2.0.0)
19+
rspec-core (2.0.0)
20+
rspec-expectations (2.0.0)
21+
diff-lcs (>= 1.1.2)
22+
rspec-mocks (2.0.0)
23+
rspec-core (= 2.0.0)
24+
rspec-expectations (= 2.0.0)
1525

1626
PLATFORMS
1727
ruby
1828

1929
DEPENDENCIES
20-
activeresource
21-
activesupport
22-
rspec (= 1.3.0)
30+
activeresource (~> 3.0.0)
31+
rspec (~> 2.0.0)

Rakefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# encoding: utf-8
22

3-
require 'spec/rake/spectask'
3+
require 'rspec/core/rake_task'
44

55
desc 'Default: run unit tests.'
66
task :default => :spec
77

88
desc "Run all specs"
9-
Spec::Rake::SpecTask.new do |t|
10-
t.spec_files = FileList['spec/**/*_spec.rb']
11-
t.spec_opts = ['--options', 'spec/spec.opts']
9+
RSpec::Core::RakeTask.new do |t|
10+
t.pattern = 'spec/**/*_spec.rb'
11+
t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
1212
end

autotest/discover.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
Autotest.add_discovery do
2-
"rspec"
3-
end
1+
Autotest.add_discovery { "rspec2" }

spec/spec.opts

-7
This file was deleted.

0 commit comments

Comments
 (0)