Skip to content

Commit a940d3e

Browse files
committed
Merge pull request #6 from thomas-holmes/update-gemspec-require-rspec-mocks
Update gemspec require rspec mocks
2 parents 57741c1 + c42fd29 commit a940d3e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

lib/rspec/active_model/mocks/mocks.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ def mock_model(string_or_model_class, stubs = {})
8888
model_class = Object.const_get(string_or_model_class)
8989
else
9090
model_class = Object.const_set(string_or_model_class, Class.new do
91-
extend ActiveModel::Naming
91+
extend ::ActiveModel::Naming
9292
def self.primary_key; :id; end
9393
end)
9494
end
9595
else
9696
model_class = string_or_model_class
9797
end
9898

99-
unless model_class.kind_of? ActiveModel::Naming
99+
unless model_class.kind_of? ::ActiveModel::Naming
100100
raise ArgumentError.new <<-EOM
101101
The mock_model method can only accept as its first argument:
102102
* A String representing a Class that does not exist

rspec-activemodel-mocks.gemspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ Gem::Specification.new do |s|
2222
s.require_path = "lib"
2323

2424
private_key = File.expand_path('~/.gem/rspec-gem-private_key.pem')
25-
if File.exist?(private_key)
25+
if File.exists?(private_key)
2626
s.signing_key = private_key
2727
s.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')]
2828
end
2929

3030
s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
3131
s.add_runtime_dependency(%q<activemodel>, [">= 3.0"])
32+
s.add_runtime_dependency(%q<rspec-mocks>, [">= 2.99.0.beta2"])
3233

3334
s.add_development_dependency 'rake', '~> 10.0.0'
3435
s.add_development_dependency 'cucumber', '~> 1.3.5'

0 commit comments

Comments
 (0)