Render viewer error synchronously so that 'view the source' link will work

5 files changed, 7 insertions, 12 deletions

diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb
index 9fbb17b3707..43af91882a4 100644
--- a/spec/features/projects/blobs/blob_show_spec.rb
+++ b/spec/features/projects/blobs/blob_show_spec.rb
@@ -19,7 +19,7 @@ feature 'File blob', feature: true do
     it 'switches to code view' do
       visit_blob('files/images/wm.svg')
 
-      first('.js-blob-viewer-switcher').click
+      first('.js-blob-viewer-switch-btn').click
 
       expect(page).to have_selector('.blob-viewer[data-type="rich"]', visible: false)
       expect(page).to have_selector('.blob-viewer[data-type="simple"]')
diff --git a/spec/javascripts/blob/viewer/index_spec.js b/spec/javascripts/blob/viewer/index_spec.js
index c95a40689c7..fe45ee3c083 100644
--- a/spec/javascripts/blob/viewer/index_spec.js
+++ b/spec/javascripts/blob/viewer/index_spec.js
@@ -26,12 +26,12 @@ describe('Blob viewer', () => {
   });
 
   it('loads source file after switching views', (done) => {
-    document.querySelector('.js-blob-viewer-switcher[data-viewer="simple"]').click();
+    document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click();
 
     setTimeout(() => {
       expect($.ajax).toHaveBeenCalled();
       expect(
-        document.querySelector('.js-blob-viewer-switcher[data-viewer="simple"]')
+        document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]')
           .classList.contains('hidden'),
       ).toBeFalsy();
 
@@ -47,7 +47,7 @@ describe('Blob viewer', () => {
     setTimeout(() => {
       expect($.ajax).toHaveBeenCalled();
       expect(
-        document.querySelector('.js-blob-viewer-switcher[data-viewer="simple"]')
+        document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]')
           .classList.contains('hidden'),
       ).toBeFalsy();
 
@@ -57,7 +57,7 @@ describe('Blob viewer', () => {
 
   it('doesnt reload file if already loaded', (done) => {
     const asyncClick = () => new Promise((resolve) => {
-      document.querySelector('.js-blob-viewer-switcher[data-viewer="simple"]').click();
+      document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click();
 
       setTimeout(resolve);
     });
@@ -91,7 +91,7 @@ describe('Blob viewer', () => {
     });
 
     it('enables after switching to simple view', (done) => {
-      document.querySelector('.js-blob-viewer-switcher[data-viewer="simple"]').click();
+      document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click();
 
       setTimeout(() => {
         expect($.ajax).toHaveBeenCalled();
@@ -104,7 +104,7 @@ describe('Blob viewer', () => {
     });
 
     it('updates tooltip after switching to simple view', (done) => {
-      document.querySelector('.js-blob-viewer-switcher[data-viewer="simple"]').click();
+      document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click();
 
       setTimeout(() => {
         expect($.ajax).toHaveBeenCalled();
diff --git a/spec/views/projects/blob/_viewer.html.haml_spoc.rb b/spec/views/projects/blob/_viewer.html.haml_spec.rb
index 1d2055c10fc..1d2055c10fc 100644
--- a/spec/views/projects/blob/_viewer.html.haml_spoc.rb
+++ b/spec/views/projects/blob/_viewer.html.haml_spec.rb
diff --git a/spec/views/projects/blob/_viewer_switcher.html.haml_spoc.rb b/spec/views/projects/blob/_viewer_switcher.html.haml_spec.rb
index 337f40d50df..337f40d50df 100644
--- a/spec/views/projects/blob/_viewer_switcher.html.haml_spoc.rb
+++ b/spec/views/projects/blob/_viewer_switcher.html.haml_spec.rb
diff --git a/spec/views/projects/blob/_viewer_wrapper.html.haml_spoc.rb b/spec/views/projects/blob/_viewer_wrapper.html.haml_spoc.rb
deleted file mode 100644
index 433ff1e63b9..00000000000
--- a/spec/views/projects/blob/_viewer_wrapper.html.haml_spoc.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe 'app/views/projects/blob/_viewer_wrapper.html.haml' do
-  # TODO: Test
-end