From 66cd2e97fbb520ff27f5e6873fb9e598e17b1224 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Sat, 20 Apr 2019 14:39:36 +0200
Subject: Merge balsamiq fixture into raw file fixtures

---
 spec/javascripts/fixtures/balsamiq.rb | 18 ------------------
 spec/javascripts/fixtures/raw.rb      |  7 +++++++
 2 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 spec/javascripts/fixtures/balsamiq.rb

diff --git a/spec/javascripts/fixtures/balsamiq.rb b/spec/javascripts/fixtures/balsamiq.rb
deleted file mode 100644
index 234e246119a..00000000000
--- a/spec/javascripts/fixtures/balsamiq.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe 'Balsamiq file', '(JavaScript fixtures)', type: :controller do
-  include JavaScriptFixturesHelpers
-
-  let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
-  let(:project) { create(:project, :repository, namespace: namespace, path: 'balsamiq-project') }
-
-  before(:all) do
-    clean_frontend_fixtures('blob/balsamiq/')
-  end
-
-  it 'blob/balsamiq/test.bmpr' do |example|
-    blob = project.repository.blob_at('b89b56d79', 'files/images/balsamiq.bmpr')
-
-    store_frontend_fixture(blob.data.force_encoding('utf-8'), example.description)
-  end
-end
diff --git a/spec/javascripts/fixtures/raw.rb b/spec/javascripts/fixtures/raw.rb
index 80304767788..264558bed4a 100644
--- a/spec/javascripts/fixtures/raw.rb
+++ b/spec/javascripts/fixtures/raw.rb
@@ -8,6 +8,7 @@ describe 'Raw files', '(JavaScript fixtures)' do
   let(:response) { @blob.data.force_encoding('UTF-8') }
 
   before(:all) do
+    clean_frontend_fixtures('blob/balsamiq/')
     clean_frontend_fixtures('blob/notebook/')
     clean_frontend_fixtures('blob/pdf/')
   end
@@ -16,6 +17,12 @@ describe 'Raw files', '(JavaScript fixtures)' do
     remove_repository(project)
   end
 
+  it 'blob/balsamiq/test.bmpr' do |example|
+    @blob = project.repository.blob_at('b89b56d79', 'files/images/balsamiq.bmpr')
+
+    store_frontend_fixture(response, example.description)
+  end
+
   it 'blob/notebook/basic.json' do |example|
     @blob = project.repository.blob_at('6d85bb69', 'files/ipython/basic.ipynb')
 
-- 
cgit v1.2.3