From 8940fe2b4eab60da4173a9c7539cbe0bc5e94b53 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 24 Apr 2017 11:30:30 -0400 Subject: [PATCH] Fix flashes partial render error for controllers which don't inherit from application controller (#2400) * Add failing spec for oauth/authorized_applications controller * Use explicit reference to flashes partial from admin layout Because some of the controllers which use the admin layout do not inherit from application controller, this partial is not in their view path. --- app/views/layouts/admin.html.haml | 2 +- ...authorized_applications_controller_spec.rb | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 spec/controllers/oauth/authorized_applications_controller_spec.rb diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index d2cff5e303..d3d97e3a04 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -13,7 +13,7 @@ .content %h2= yield :page_title - = render 'flashes' + = render 'application/flashes' = yield diff --git a/spec/controllers/oauth/authorized_applications_controller_spec.rb b/spec/controllers/oauth/authorized_applications_controller_spec.rb new file mode 100644 index 0000000000..f5d64bd90b --- /dev/null +++ b/spec/controllers/oauth/authorized_applications_controller_spec.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe Oauth::AuthorizedApplicationsController do + render_views + + before do + sign_in Fabricate(:user), scope: :user + end + + describe 'GET #index' do + before do + get :index + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + end +end