summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-12-03 16:44:59 +0000
committerRobert Speicher <rspeicher@gmail.com>2018-12-03 16:44:59 +0000
commit006659e74581a530716c9e633c356c468f5cafd2 (patch)
treeda187af79d41c7ba38b892c41a1615cc60abacb6 /spec/controllers
parent2859e8d54f948184ac489afea995c65ed0ca325c (diff)
parent1bb4ad9262efde3b7aefddf849480a102763a68f (diff)
downloadgitlab-ce-006659e74581a530716c9e633c356c468f5cafd2.tar.gz
Merge branch 'render-text-deprecated' into 'master'
Fix deprecation: render :text is deprecated because it does not actually render… See merge request gitlab-org/gitlab-ce!23425
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/application_controller_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 1b585bcd4c6..ac92b2ca657 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -114,7 +114,7 @@ describe ApplicationController do
skip_before_action :authenticate_user!, only: :index
def index
- render text: 'authenticated'
+ render html: 'authenticated'
end
end
@@ -401,7 +401,7 @@ describe ApplicationController do
context 'terms' do
controller(described_class) do
def index
- render text: 'authenticated'
+ render html: 'authenticated'
end
end
@@ -444,7 +444,7 @@ describe ApplicationController do
attr_reader :last_payload
def index
- render text: 'authenticated'
+ render html: 'authenticated'
end
def append_info_to_payload(payload)