summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-04-20 14:39:36 +0200
committerWinnie Hellmann <winnie@gitlab.com>2019-05-10 14:12:19 +0200
commit66cd2e97fbb520ff27f5e6873fb9e598e17b1224 (patch)
tree49cc7fe267a75be96d716afdb4962ff0997edf68
parentdff8bd0c03f2d8f186909855a46d46bb90d9b391 (diff)
downloadgitlab-ce-66cd2e97fbb520ff27f5e6873fb9e598e17b1224.tar.gz
Merge balsamiq fixture into raw file fixtures
-rw-r--r--spec/javascripts/fixtures/balsamiq.rb18
-rw-r--r--spec/javascripts/fixtures/raw.rb7
2 files changed, 7 insertions, 18 deletions
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')