39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
|
From 158839b3a60f0c2a1f243f6e65ec620be55982ee Mon Sep 17 00:00:00 2001
|
||
|
|
From: Elliot Winkler <elliot.winkler@gmail.com>
|
||
|
|
Date: Tue, 26 Sep 2017 17:19:44 -0500
|
||
|
|
Subject: [PATCH] Use `head` instead of `render: nothing` in tests
|
||
|
|
|
||
|
|
`render nothing: true` was removed from Rails 5.1 and has no effect
|
||
|
|
anymore -- it was replaced with `head`.
|
||
|
|
---
|
||
|
|
spec/acceptance/rails_integration_spec.rb | 2 +-
|
||
|
|
.../shoulda/matchers/action_controller/permit_matcher_spec.rb | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/spec/acceptance/rails_integration_spec.rb b/spec/acceptance/rails_integration_spec.rb
|
||
|
|
index 8755b3a8..f18a6725 100644
|
||
|
|
--- a/spec/acceptance/rails_integration_spec.rb
|
||
|
|
+++ b/spec/acceptance/rails_integration_spec.rb
|
||
|
|
@@ -26,7 +26,7 @@ class User < ActiveRecord::Base
|
||
|
|
class ExamplesController < ApplicationController
|
||
|
|
def show
|
||
|
|
@example = 'hello'
|
||
|
|
- render nothing: true
|
||
|
|
+ head :ok
|
||
|
|
end
|
||
|
|
end
|
||
|
|
FILE
|
||
|
|
diff --git a/spec/unit/shoulda/matchers/action_controller/permit_matcher_spec.rb b/spec/unit/shoulda/matchers/action_controller/permit_matcher_spec.rb
|
||
|
|
index b8857df9..509a9bbd 100644
|
||
|
|
--- a/spec/unit/shoulda/matchers/action_controller/permit_matcher_spec.rb
|
||
|
|
+++ b/spec/unit/shoulda/matchers/action_controller/permit_matcher_spec.rb
|
||
|
|
@@ -586,7 +586,7 @@ def define_controller_with_strong_parameters(options = {}, &action_body)
|
||
|
|
end
|
||
|
|
end
|
||
|
|
|
||
|
|
- render nothing: true
|
||
|
|
+ head :ok
|
||
|
|
end
|
||
|
|
end
|
||
|
|
|