Merge branch 'master' into v1.3.0

AaronLasseigne · Jun 13, 2014 · 040d1f3 · 040d1f3
2 parents 6d11f3e + 2cbec8e
commit 040d1f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Rakefile b/Rakefile
@@ -5,6 +5,6 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new
-Rubocop::RakeTask.new
+RuboCop::RakeTask.new
 
 task default: %w[spec rubocop]
diff --git a/spec/active_interaction/modules/validation_spec.rb b/spec/active_interaction/modules/validation_spec.rb
@@ -21,7 +21,7 @@
       let(:inputs) { { name: 1 } }
 
       before do
-        filter.stub(:cast).and_return(1)
+        allow(filter).to receive(:cast).and_return(1)
       end
 
       it 'returns no errors' do
@@ -31,7 +31,7 @@
 
     context 'filter throws' do
       before do
-        filter.stub(:cast).and_raise(exception)
+        allow(filter).to receive(:cast).and_raise(exception)
       end
 
       context 'InvalidValueError' do