From 9f49007b7b25ee42da254f2919598db28f9847e1 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 5 Feb 2019 13:49:16 +0000 Subject: [PATCH] FIX: Rescue and display import errors when updating theme via git --- app/controllers/admin/themes_controller.rb | 2 ++ spec/requests/admin/themes_controller_spec.rb | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb index f927eee3374..31bda272ded 100644 --- a/app/controllers/admin/themes_controller.rb +++ b/app/controllers/admin/themes_controller.rb @@ -209,6 +209,8 @@ class Admin::ThemesController < Admin::AdminController end end end + rescue RemoteTheme::ImportError => e + render_json_error e.message end def destroy diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb index dc25e125138..c20b1284a0f 100644 --- a/spec/requests/admin/themes_controller_spec.rb +++ b/spec/requests/admin/themes_controller_spec.rb @@ -311,7 +311,19 @@ describe Admin::ThemesController do # Database correct theme.reload expect(theme.theme_translation_overrides.count).to eq(0) + end + it 'handles import errors on update' do + theme.create_remote_theme!(remote_url: "https://example.com/repository") + + # RemoteTheme is extensively tested, and setting up the test scaffold is a large overhead + # So use a stub here to test the controller + RemoteTheme.any_instance.stubs(:update_from_remote).raises(RemoteTheme::ImportError.new("error message")) + put "/admin/themes/#{theme.id}.json", params: { + theme: { remote_update: true } + } + expect(response.status).to eq(422) + expect(JSON.parse(response.body)["errors"].first).to eq("error message") end it 'returns the right error message' do