Skip to content

Commit 3007dad

Browse files
authored
Merge pull request #680 from olleolleolle/fix/update-rspec
Avoid RSpec monkey patching, persist spec results locally, use RSpec v3.7.0
2 parents d3ce358 + 01f5397 commit 3007dad

File tree

87 files changed

+148
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+148
-145
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ tmtags
2424
# junk
2525
.DS_Store
2626
.githubtoken
27+
28+
spec/examples.txt

Gemfile

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

2222
group :testing do
23-
gem 'rspec', '~> 3.3.0'
23+
gem 'rspec', '~> 3.7'
2424
gem 'timecop', '~> 0.7.4'
2525
end
2626

spec/concurrent/actor_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module Actor
66

77
# FIXME better tests!
88

9-
describe 'Concurrent::Actor', edge: true, if: !defined?(JRUBY_VERSION) do
9+
RSpec.describe 'Concurrent::Actor', edge: true, if: !defined?(JRUBY_VERSION) do
1010

1111
def terminate_actors(*actors)
1212
actors.each do |actor|

spec/concurrent/agent_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module Concurrent
44

5-
describe Agent do
5+
RSpec.describe Agent do
66

77
let!(:immediate) { Concurrent::ImmediateExecutor.new }
88
let!(:executor) { Concurrent::SingleThreadExecutor.new }

spec/concurrent/array_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Concurrent
2-
describe Array do
2+
RSpec.describe Array do
33
let!(:ary) { described_class.new }
44

55
it 'concurrency' do

spec/concurrent/async_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Concurrent
22

3-
describe Async do
3+
RSpec.describe Async do
44

55
let(:async_class) do
66
Class.new do

spec/concurrent/atom_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module Concurrent
44

5-
describe Atom do
5+
RSpec.describe Atom do
66

77
context 'construction' do
88

spec/concurrent/atomic/atomic_boolean_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
shared_examples :atomic_boolean do
1+
RSpec.shared_examples :atomic_boolean do
22

33
describe 'construction' do
44

@@ -104,7 +104,7 @@
104104

105105
module Concurrent
106106

107-
describe MutexAtomicBoolean do
107+
RSpec.describe MutexAtomicBoolean do
108108

109109
it_should_behave_like :atomic_boolean
110110

@@ -142,19 +142,19 @@ module Concurrent
142142

143143
if defined? Concurrent::CAtomicBoolean
144144

145-
describe CAtomicBoolean, ext: true do
145+
RSpec.describe CAtomicBoolean, ext: true do
146146
it_should_behave_like :atomic_boolean
147147
end
148148
end
149149

150150
if Concurrent.on_jruby?
151151

152-
describe JavaAtomicBoolean do
152+
RSpec.describe JavaAtomicBoolean do
153153
it_should_behave_like :atomic_boolean
154154
end
155155
end
156156

157-
describe AtomicBoolean do
157+
RSpec.describe AtomicBoolean do
158158
if RUBY_ENGINE != 'ruby'
159159
it 'does not load the C extension' do
160160
expect(defined?(Concurrent::CAtomicBoolean)).to be_falsey

spec/concurrent/atomic/atomic_fixnum_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
shared_examples :atomic_fixnum do
1+
RSpec.shared_examples :atomic_fixnum do
22

33
context 'construction' do
44

@@ -153,7 +153,7 @@
153153

154154
module Concurrent
155155

156-
describe MutexAtomicFixnum do
156+
RSpec.describe MutexAtomicFixnum do
157157

158158
it_should_behave_like :atomic_fixnum
159159

@@ -202,19 +202,19 @@ module Concurrent
202202

203203
if defined? Concurrent::CAtomicFixnum
204204

205-
describe CAtomicFixnum, ext: true do
205+
RSpec.describe CAtomicFixnum, ext: true do
206206
it_should_behave_like :atomic_fixnum
207207
end
208208
end
209209

210210
if Concurrent.on_jruby?
211211

212-
describe JavaAtomicFixnum do
212+
RSpec.describe JavaAtomicFixnum do
213213
it_should_behave_like :atomic_fixnum
214214
end
215215
end
216216

217-
describe AtomicFixnum do
217+
RSpec.describe AtomicFixnum do
218218
if RUBY_ENGINE != 'ruby'
219219
it 'does not load the C extension' do
220220
expect(defined?(Concurrent::CAtomicFixnum)).to be_falsey

spec/concurrent/atomic/atomic_markable_reference_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
describe Concurrent::Edge::AtomicMarkableReference do
1+
RSpec.describe Concurrent::Edge::AtomicMarkableReference do
22
subject { described_class.new 1000, true }
33

44
describe '.initialize' do

0 commit comments

Comments
 (0)