From 53d758ca2163658baeeb697ff354c385633588f5 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 12 Mar 2021 20:34:24 +0000 Subject: [PATCH] Replace render text with render plain for rails 5.1 --- .../admin/enterprise_relationships_controller.rb | 2 +- app/controllers/admin/enterprise_roles_controller.rb | 2 +- app/controllers/admin/resource_controller.rb | 2 +- app/controllers/api/enterprise_fees_controller.rb | 4 ++-- app/controllers/api/enterprises_controller.rb | 4 ++-- app/controllers/api/exchange_products_controller.rb | 2 +- app/controllers/api/shops_controller.rb | 2 +- app/controllers/discourse_sso_controller.rb | 2 +- app/controllers/enterprises_controller.rb | 6 +++--- app/controllers/stripe/callbacks_controller.rb | 2 +- spec/controllers/api/base_controller_spec.rb | 2 +- spec/controllers/base_controller_spec.rb | 2 +- spec/controllers/spree/admin/base_controller_spec.rb | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/controllers/admin/enterprise_relationships_controller.rb b/app/controllers/admin/enterprise_relationships_controller.rb index 8a6bc7c5c3..4a17abb98d 100644 --- a/app/controllers/admin/enterprise_relationships_controller.rb +++ b/app/controllers/admin/enterprise_relationships_controller.rb @@ -14,7 +14,7 @@ module Admin @enterprise_relationship = EnterpriseRelationship.new enterprise_relationship_params if @enterprise_relationship.save - render text: Api::Admin::EnterpriseRelationshipSerializer.new(@enterprise_relationship).to_json + render plain: Api::Admin::EnterpriseRelationshipSerializer.new(@enterprise_relationship).to_json else render status: :bad_request, json: { errors: @enterprise_relationship.errors.full_messages.join(', ') } end diff --git a/app/controllers/admin/enterprise_roles_controller.rb b/app/controllers/admin/enterprise_roles_controller.rb index 41f03b2e80..c1b7be07e0 100644 --- a/app/controllers/admin/enterprise_roles_controller.rb +++ b/app/controllers/admin/enterprise_roles_controller.rb @@ -10,7 +10,7 @@ module Admin @enterprise_role = EnterpriseRole.new enterprise_role_params if @enterprise_role.save - render text: Api::Admin::EnterpriseRoleSerializer.new(@enterprise_role).to_json + render plain: Api::Admin::EnterpriseRoleSerializer.new(@enterprise_role).to_json else render status: :bad_request, json: { errors: @enterprise_role.errors.full_messages.join(', ') } diff --git a/app/controllers/admin/resource_controller.rb b/app/controllers/admin/resource_controller.rb index 3e531aac35..b316046b4b 100644 --- a/app/controllers/admin/resource_controller.rb +++ b/app/controllers/admin/resource_controller.rb @@ -62,7 +62,7 @@ module Admin end respond_to do |format| - format.js { render text: 'Ok' } + format.js { render plain: 'Ok' } end end diff --git a/app/controllers/api/enterprise_fees_controller.rb b/app/controllers/api/enterprise_fees_controller.rb index c966efa7cc..3252961f97 100644 --- a/app/controllers/api/enterprise_fees_controller.rb +++ b/app/controllers/api/enterprise_fees_controller.rb @@ -6,9 +6,9 @@ module Api authorize! :destroy, enterprise_fee if enterprise_fee.destroy - render text: I18n.t(:successfully_removed), status: :no_content + render plain: I18n.t(:successfully_removed), status: :no_content else - render text: enterprise_fee.errors.full_messages.first, status: :forbidden + render plain: enterprise_fee.errors.full_messages.first, status: :forbidden end end diff --git a/app/controllers/api/enterprises_controller.rb b/app/controllers/api/enterprises_controller.rb index dfbde81f31..bcec80f3a6 100644 --- a/app/controllers/api/enterprises_controller.rb +++ b/app/controllers/api/enterprises_controller.rb @@ -37,9 +37,9 @@ module Api authorize! :update, @enterprise if params[:logo] && @enterprise.update( logo: params[:logo] ) - render text: @enterprise.logo.url(:medium), status: :ok + render plain: @enterprise.logo.url(:medium), status: :ok elsif params[:promo] && @enterprise.update( promo_image: params[:promo] ) - render text: @enterprise.promo_image.url(:medium), status: :ok + render plain: @enterprise.promo_image.url(:medium), status: :ok else invalid_resource!(@enterprise) end diff --git a/app/controllers/api/exchange_products_controller.rb b/app/controllers/api/exchange_products_controller.rb index e1821b36b3..b43321841c 100644 --- a/app/controllers/api/exchange_products_controller.rb +++ b/app/controllers/api/exchange_products_controller.rb @@ -32,7 +32,7 @@ module Api private def render_variant_count - render text: { + render plain: { count: variants.count }.to_json end diff --git a/app/controllers/api/shops_controller.rb b/app/controllers/api/shops_controller.rb index 48ed28e47a..377e849378 100644 --- a/app/controllers/api/shops_controller.rb +++ b/app/controllers/api/shops_controller.rb @@ -8,7 +8,7 @@ module Api def show enterprise = Enterprise.find_by(id: params[:id]) - render text: Api::EnterpriseShopfrontSerializer.new(enterprise).to_json, status: :ok + render plain: Api::EnterpriseShopfrontSerializer.new(enterprise).to_json, status: :ok end def closed_shops diff --git a/app/controllers/discourse_sso_controller.rb b/app/controllers/discourse_sso_controller.rb index bd4abd052c..e6753fb3db 100644 --- a/app/controllers/discourse_sso_controller.rb +++ b/app/controllers/discourse_sso_controller.rb @@ -19,7 +19,7 @@ class DiscourseSsoController < ApplicationController begin redirect_to sso_url rescue TypeError - render text: "Bad SingleSignOn request.", status: :bad_request + render plain: "Bad SingleSignOn request.", status: :bad_request end else redirect_to login_path diff --git a/app/controllers/enterprises_controller.rb b/app/controllers/enterprises_controller.rb index 3dfd5a2351..841c9c76ff 100644 --- a/app/controllers/enterprises_controller.rb +++ b/app/controllers/enterprises_controller.rb @@ -39,14 +39,14 @@ class EnterprisesController < BaseController def check_permalink if Enterprise.find_by permalink: params[:permalink] - render(text: params[:permalink], status: :conflict) && return + render(plain: params[:permalink], status: :conflict) && return end begin Rails.application.routes.recognize_path( "/#{params[:permalink]}" ) - render text: params[:permalink], status: :conflict + render plain: params[:permalink], status: :conflict rescue ActionController::RoutingError - render text: params[:permalink], status: :ok + render plain: params[:permalink], status: :ok end end diff --git a/app/controllers/stripe/callbacks_controller.rb b/app/controllers/stripe/callbacks_controller.rb index 985596dc63..c699926a94 100644 --- a/app/controllers/stripe/callbacks_controller.rb +++ b/app/controllers/stripe/callbacks_controller.rb @@ -15,7 +15,7 @@ module Stripe end redirect_to main_app.edit_admin_enterprise_path(connector.enterprise, anchor: 'payment_methods') rescue Stripe::StripeError => e - render text: e.message, status: :internal_server_error + render plain: e.message, status: :internal_server_error end end end diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb index b72bdf1863..2392c24343 100644 --- a/spec/controllers/api/base_controller_spec.rb +++ b/spec/controllers/api/base_controller_spec.rb @@ -8,7 +8,7 @@ describe Api::BaseController do skip_authorization_check only: :index def index - render text: { "products" => [] }.to_json + render plain: { "products" => [] }.to_json end def spree_current_user; end diff --git a/spec/controllers/base_controller_spec.rb b/spec/controllers/base_controller_spec.rb index d0b9e54d6d..2f82f52e7d 100644 --- a/spec/controllers/base_controller_spec.rb +++ b/spec/controllers/base_controller_spec.rb @@ -7,7 +7,7 @@ describe BaseController, type: :controller do let(:order) { instance_double(Spree::Order) } controller(BaseController) do def index - render text: "" + render plain: "" end end diff --git a/spec/controllers/spree/admin/base_controller_spec.rb b/spec/controllers/spree/admin/base_controller_spec.rb index 5cbcfbfc58..07e3b90f0a 100644 --- a/spec/controllers/spree/admin/base_controller_spec.rb +++ b/spec/controllers/spree/admin/base_controller_spec.rb @@ -6,7 +6,7 @@ describe Spree::Admin::BaseController, type: :controller do controller(Spree::Admin::BaseController) do def index before_filter :unauthorized - render text: "" + render plain: "" end end