Skip to content

Commit ee08c30

Browse files
stanislawbmabey
stanislaw
authored and
bmabey
committed
upgrade to RSpec2
1 parent 5381eab commit ee08c30

File tree

19 files changed

+73
-48
lines changed

19 files changed

+73
-48
lines changed

‎.rspec

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--color
2+
--format documentation
3+
mtime
4+
--backtrace

‎.rvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rvm ruby-1.8.7-p248
1+
rvm 1.8.7

‎Gemfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,13 @@ group :development do
3434
gem "couch_potato", "0.3.0"
3535
gem "sequel", "~>3.21.0"
3636
#gem "ibm_db" # I don't want to add this dependency, even as a dev one since it requires DB2 to be installed
37+
gem 'mysql'
38+
gem 'mysql2', '~> 0.2.0'
39+
gem 'pg'
3740
end
3841

3942
group :test do
40-
gem "rspec"
43+
gem "rspec-rails"
4144
gem "rspactor"
4245
gem "rcov"
4346
gem "ZenTest"

‎Gemfile.lock

+37-21
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ GEM
55
activerecord (2.3.8)
66
activesupport (= 2.3.8)
77
activesupport (2.3.8)
8-
addressable (2.2.0)
9-
bson (1.0.4)
8+
addressable (2.2.8)
9+
bson (1.0.9)
1010
builder (2.1.2)
1111
columnize (0.3.1)
1212
couch_potato (0.3.0)
1313
couchrest (>= 0.24)
1414
json
15-
couchrest (1.0.1)
16-
json (>= 1.4.6)
17-
mime-types (>= 1.15)
18-
rest-client (>= 1.5.1)
15+
couchrest (1.1.2)
16+
mime-types (~> 1.15)
17+
multi_json (~> 1.0.0)
18+
rest-client (~> 1.6.1)
1919
cucumber (0.8.5)
2020
builder (~> 2.1.2)
2121
diff-lcs (~> 1.1.2)
2222
gherkin (~> 2.1.4)
2323
json_pure (~> 1.4.3)
2424
term-ansicolor (~> 1.0.4)
25-
data_objects (0.10.2)
25+
data_objects (0.10.8)
2626
addressable (~> 2.1)
2727
datamapper (1.0.0)
2828
dm-aggregates (= 1.0.0)
@@ -68,11 +68,11 @@ GEM
6868
uuidtools (~> 2.1.1)
6969
dm-validations (1.0.0)
7070
dm-core (~> 1.0.0)
71-
do_sqlite3 (0.10.2)
72-
data_objects (= 0.10.2)
71+
do_sqlite3 (0.10.8)
72+
data_objects (= 0.10.8)
7373
durran-validatable (2.0.1)
7474
extlib (0.9.15)
75-
fastercsv (1.5.3)
75+
fastercsv (1.5.5)
7676
ffi (0.6.3)
7777
rake (>= 0.8.7)
7878
gemcutter (0.6.1)
@@ -86,14 +86,14 @@ GEM
8686
rubyforge (>= 2.0.0)
8787
jnunemaker-validatable (1.8.4)
8888
activesupport (>= 2.3.4)
89-
json (1.4.6)
89+
json (1.7.3)
9090
json_pure (1.4.6)
9191
libnotify (0.2.0)
9292
ffi (>= 0.6.2)
9393
linecache (0.43)
94-
mime-types (1.16)
95-
mongo (1.0.7)
96-
bson (>= 1.0.4)
94+
mime-types (1.19)
95+
mongo (1.0.9)
96+
bson (>= 1.0.5)
9797
mongo_mapper (0.8.2)
9898
activesupport (>= 2.3.4)
9999
jnunemaker-validatable (~> 1.8.4)
@@ -104,13 +104,17 @@ GEM
104104
durran-validatable (>= 2.0.1)
105105
mongo (~> 1.0.1)
106106
will_paginate (< 2.9)
107-
plucky (0.3.4)
108-
mongo (~> 1.0.7)
107+
multi_json (1.0.4)
108+
mysql (2.8.1)
109+
mysql2 (0.2.18)
110+
pg (0.14.0)
111+
plucky (0.3.5)
112+
mongo (~> 1.0.8)
109113
rake (0.8.7)
110114
rb-inotify (0.8.1)
111115
ffi (>= 0.5.0)
112116
rcov (0.9.8)
113-
rest-client (1.6.0)
117+
rest-client (1.6.7)
114118
mime-types (>= 1.16)
115119
rspactor (0.7.0.beta.6)
116120
bundler (>= 1.0.0.rc.5)
@@ -119,7 +123,16 @@ GEM
119123
rb-inotify
120124
sys-uname (>= 0.8.4)
121125
trollop (>= 1.16.2)
122-
rspec (1.3.0)
126+
rspec (2.1.0)
127+
rspec-core (~> 2.1.0)
128+
rspec-expectations (~> 2.1.0)
129+
rspec-mocks (~> 2.1.0)
130+
rspec-core (2.1.0)
131+
rspec-expectations (2.1.0)
132+
diff-lcs (~> 1.1.2)
133+
rspec-mocks (2.1.0)
134+
rspec-rails (2.1.0)
135+
rspec (~> 2.1.0)
123136
ruby-debug (0.10.3)
124137
columnize (>= 0.1)
125138
ruby-debug-base (~> 0.10.3.0)
@@ -134,8 +147,8 @@ GEM
134147
term-ansicolor (1.0.5)
135148
trollop (1.16.2)
136149
tzinfo (0.3.22)
137-
uuidtools (2.1.1)
138-
will_paginate (2.3.14)
150+
uuidtools (2.1.2)
151+
will_paginate (2.3.16)
139152

140153
PLATFORMS
141154
ruby
@@ -153,10 +166,13 @@ DEPENDENCIES
153166
json_pure
154167
mongo_mapper (= 0.8.2)
155168
mongoid (= 1.9.1)
169+
mysql
170+
mysql2 (~> 0.2.0)
171+
pg
156172
rake
157173
rcov
158174
rspactor
159-
rspec
175+
rspec-rails
160176
ruby-debug
161177
sequel (~> 3.21.0)
162178
sqlite3-ruby

‎Rakefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ Rake::RDocTask.new do |rdoc|
2828
rdoc.rdoc_files.include('lib/**/*.rb')
2929
end
3030

31-
require 'spec/rake/spectask'
32-
Spec::Rake::SpecTask.new(:spec) do |t|
33-
t.libs << 'lib' << 'spec'
34-
t.spec_files = FileList['spec/**/*_spec.rb']
31+
32+
require 'rspec/core'
33+
require 'rspec/core/rake_task'
34+
RSpec::Core::RakeTask.new(:spec) do |spec|
35+
spec.pattern = FileList['spec/**/*_spec.rb']
3536
end
3637

37-
Spec::Rake::SpecTask.new(:rcov) do |t|
38-
t.libs << 'lib' << 'spec'
39-
t.spec_files = FileList['spec/**/*_spec.rb']
40-
t.rcov = true
38+
RSpec::Core::RakeTask.new(:rcov) do |spec|
39+
spec.pattern = 'spec/**/*_spec.rb'
40+
spec.rcov = true
4141
end
4242

4343
begin

‎examples/features/support/env.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
require 'bundler'
66

77
Bundler.setup
8-
require 'spec/expectations'
8+
require 'rspec/expectations'
99
require 'ruby-debug'
1010

1111
DB_DIR = "#{File.dirname(__FILE__)}/../../db"

‎features/support/env.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
22
require 'database_cleaner'
33

4-
require 'spec/expectations'
4+
require 'rspec/expectations'
55

66
require 'test/unit/assertions'
77

‎spec/database_cleaner/active_record/base_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper'
22
require 'active_record'
33
require 'database_cleaner/active_record/base'
4-
require 'database_cleaner/shared_strategy_spec'
4+
require 'database_cleaner/shared_strategy'
55

66
module DatabaseCleaner
77
describe ActiveRecord do

‎spec/database_cleaner/configuration_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require File.dirname(__FILE__) + '/../spec_helper'
1+
require 'spec_helper'
22

33
module DatabaseCleaner
44
class << self
@@ -197,7 +197,7 @@ def connections_stub!(array)
197197
# plausably want to force orm/strategy change on two sets of orm that differ only on db
198198
context "multiple orm proxy methods" do
199199

200-
it "should proxy orm to all connections and remove duplicate connections" do
200+
pending "should proxy orm to all connections and remove duplicate connections" do
201201
active_record_1 = mock("active_mock_on_db_one").as_null_object
202202
active_record_2 = mock("active_mock_on_db_two").as_null_object
203203
data_mapper_1 = mock("data_mock_on_db_one").as_null_object

‎spec/database_cleaner/data_mapper/base_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'spec_helper'
22
require 'database_cleaner/data_mapper/base'
3-
require 'database_cleaner/shared_strategy_spec'
3+
require 'database_cleaner/shared_strategy'
44

55
module DatabaseCleaner
66
describe DataMapper do

‎spec/database_cleaner/data_mapper/transaction_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require File.dirname(__FILE__) + '/../../spec_helper'
22
require 'database_cleaner/data_mapper/transaction'
3-
require 'database_cleaner/shared_strategy_spec'
3+
require 'database_cleaner/shared_strategy'
44
#require 'data_mapper'
55

66
module DatabaseCleaner

‎spec/database_cleaner/data_mapper/truncation_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require 'database_cleaner/data_mapper/truncation'
2-
require 'database_cleaner/shared_strategy_spec'
2+
require 'database_cleaner/shared_strategy'
33

44
module DatabaseCleaner
55
module DataMapper

‎spec/database_cleaner/generic/base_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require 'spec_helper'
2-
require 'database_cleaner/shared_strategy_spec'
2+
require 'database_cleaner/shared_strategy'
33
require 'database_cleaner/generic/base'
44

55
module ::DatabaseCleaner

‎spec/database_cleaner/mongo_mapper/base_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'spec_helper'
22
require 'database_cleaner/mongo_mapper/base'
3-
require 'database_cleaner/shared_strategy_spec'
3+
require 'database_cleaner/shared_strategy'
44

55
module DatabaseCleaner
66
describe MongoMapper do

‎spec/database_cleaner/sequel/base_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'spec_helper'
22
require 'database_cleaner/sequel/base'
3-
require 'database_cleaner/shared_strategy_spec'
3+
require 'database_cleaner/shared_strategy'
44
require 'sequel'
55

66
module DatabaseCleaner

‎spec/database_cleaner/sequel/transaction_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'spec_helper'
22
require 'database_cleaner/sequel/transaction'
3-
require 'database_cleaner/shared_strategy_spec'
3+
require 'database_cleaner/shared_strategy'
44
require 'sequel'
55

66
module DatabaseCleaner

‎spec/database_cleaner/sequel/truncation_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'spec_helper'
22
require 'database_cleaner/sequel/truncation'
3-
require 'database_cleaner/shared_strategy_spec'
3+
require 'database_cleaner/shared_strategy'
44
require 'sequel'
55

66
module DatabaseCleaner

‎spec/database_cleaner/shared_strategy_spec.rb ‎spec/database_cleaner/shared_strategy.rb

File renamed without changes.

‎spec/spec_helper.rb

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33
require "bundler"
44
Bundler.setup
55

6+
require 'rspec/core'
7+
require 'rspec/mocks'
68

7-
require 'spec'
89
#require 'active_record'
910
#require 'mongo_mapper'
10-
$:.unshift(File.dirname(__FILE__) + '/../lib')
11-
require 'database_cleaner'
1211

12+
$:.unshift(File.dirname(__FILE__))
13+
$:.unshift(File.dirname(__FILE__) + '/../lib')
1314

15+
require 'database_cleaner'
1416

15-
Spec::Runner.configure do |config|
17+
RSpec.configure do |config|
1618

1719
end
1820

0 commit comments

Comments
 (0)