Skip to content

Commit e31a44f

Browse files
author
Austin Schneider
committed
upgrade rspec
1 parent 75cf427 commit e31a44f

File tree

4 files changed

+21
-19
lines changed

4 files changed

+21
-19
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ group :assets do
2020
end
2121

2222
group :test do
23-
gem 'rspec-rails', '~> 2.7.0'
23+
gem 'rspec-rails', '~> 2.14'
2424
gem 'cucumber-rails', '~> 1.2.0'
2525
gem 'database_cleaner', '~> 0.6.7'
2626
gem 'accept_values_for', '~> 0.4.3'

Gemfile.lock

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ GEM
6464
cucumber (>= 1.1.1)
6565
nokogiri (>= 1.5.0)
6666
database_cleaner (0.6.7)
67-
diff-lcs (1.1.3)
67+
diff-lcs (1.2.4)
6868
erubis (2.7.0)
6969
execjs (1.2.9)
7070
multi_json (~> 1.0)
@@ -152,19 +152,21 @@ GEM
152152
resque_spec (0.7.0)
153153
resque (>= 1.15.0)
154154
rspec (>= 2.5.0)
155-
rspec (2.7.0)
156-
rspec-core (~> 2.7.0)
157-
rspec-expectations (~> 2.7.0)
158-
rspec-mocks (~> 2.7.0)
159-
rspec-core (2.7.1)
160-
rspec-expectations (2.7.0)
161-
diff-lcs (~> 1.1.2)
162-
rspec-mocks (2.7.0)
163-
rspec-rails (2.7.0)
164-
actionpack (~> 3.0)
165-
activesupport (~> 3.0)
166-
railties (~> 3.0)
167-
rspec (~> 2.7.0)
155+
rspec (2.14.1)
156+
rspec-core (~> 2.14.0)
157+
rspec-expectations (~> 2.14.0)
158+
rspec-mocks (~> 2.14.0)
159+
rspec-core (2.14.5)
160+
rspec-expectations (2.14.2)
161+
diff-lcs (>= 1.1.3, < 2.0)
162+
rspec-mocks (2.14.3)
163+
rspec-rails (2.14.0)
164+
actionpack (>= 3.0)
165+
activesupport (>= 3.0)
166+
railties (>= 3.0)
167+
rspec-core (~> 2.14.0)
168+
rspec-expectations (~> 2.14.0)
169+
rspec-mocks (~> 2.14.0)
168170
rubyzip (0.9.4)
169171
rufus-scheduler (2.0.12)
170172
tzinfo (>= 0.3.23)
@@ -234,7 +236,7 @@ DEPENDENCIES
234236
resque (= 1.20.0)
235237
resque-scheduler (= 1.9.9)
236238
resque_spec (~> 0.7.0)
237-
rspec-rails (~> 2.7.0)
239+
rspec-rails (~> 2.14)
238240
sass-rails (~> 3.2.6)
239241
squeel (= 0.9.3)
240242
timecop (~> 0.3.5)

spec/lib/pinger/location/presenter_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
["nil", lambda { nil }]
3232
].each do |text, method_block|
3333
context "when the location's next ping date is #{text}" do
34-
before { location.stub :next_ping_date, method_block }
34+
before { location.stub :next_ping_date, &method_block }
3535
it { subject.next_ping.should == 'just a moment' }
3636
end
3737
end

spec/lib/pinger/paginates_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
subject { described_class }
66

77
describe "paginate" do
8-
context "when there are 10 #{subject.to_s.downcase} and 3 per page" do
8+
context "when there are 10 #{described_class.to_s.downcase} and 3 per page" do
99
before do
1010
@items = 10.times.map { create(subject.to_s.downcase.to_sym) }
1111
@per_page = 3
@@ -18,7 +18,7 @@
1818
[4, 10, 10]
1919
].each do |page, start_nbr, end_nbr|
2020
context "when the page is #{page}" do
21-
it "returns #{subject.to_s.downcase}s #{start_nbr} through #{end_nbr}" do
21+
it "returns #{described_class.to_s.downcase}s #{start_nbr} through #{end_nbr}" do
2222
subject.paginate(page, @per_page).should == @items[(start_nbr - 1)..(end_nbr - 1)]
2323
end
2424
end

0 commit comments

Comments
 (0)