From bf5248ac28bf817344a8b1b4feda744a0832d32d Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 11 Apr 2017 21:25:10 +0100
Subject: Pull in fixture files from the repo

---
 spec/javascripts/fixtures/raw.rb                   | 24 ++++++++++++++++++++++
 spec/javascripts/notebook/cells/code_spec.js       |  6 +++++-
 spec/javascripts/notebook/cells/markdown_spec.js   |  8 ++++++--
 .../notebook/cells/output/index_spec.js            |  6 +++++-
 spec/javascripts/notebook/index_spec.js            |  9 ++++++--
 spec/support/test_env.rb                           |  3 ++-
 6 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 spec/javascripts/fixtures/raw.rb

(limited to 'spec')

diff --git a/spec/javascripts/fixtures/raw.rb b/spec/javascripts/fixtures/raw.rb
new file mode 100644
index 00000000000..1ce622fc836
--- /dev/null
+++ b/spec/javascripts/fixtures/raw.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe 'Raw files', '(JavaScript fixtures)', type: :controller do
+  include JavaScriptFixturesHelpers
+
+  let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
+  let(:project) { create(:project, namespace: namespace, path: 'raw-project') }
+
+  before(:all) do
+    clean_frontend_fixtures('blob/notebook/')
+  end
+
+  it 'blob/notebook/basic.json' do |example|
+    blob = project.repository.blob_at('6d85bb69', 'files/ipython/basic.ipynb')
+
+    store_frontend_fixture(blob.data, example.description)
+  end
+
+  it 'blob/notebook/worksheets.json' do |example|
+    blob = project.repository.blob_at('6d85bb69', 'files/ipython/worksheets.ipynb')
+
+    store_frontend_fixture(blob.data, example.description)
+  end
+end
diff --git a/spec/javascripts/notebook/cells/code_spec.js b/spec/javascripts/notebook/cells/code_spec.js
index e1df98b70ba..0c432d73f67 100644
--- a/spec/javascripts/notebook/cells/code_spec.js
+++ b/spec/javascripts/notebook/cells/code_spec.js
@@ -1,11 +1,15 @@
 import Vue from 'vue';
 import CodeComponent from '~/notebook/cells/code.vue';
-import json from '../../fixtures/notebook/file.json';
 
 const Component = Vue.extend(CodeComponent);
 
 describe('Code component', () => {
   let vm;
+  let json;
+
+  beforeEach(() => {
+    json = getJSONFixture('blob/notebook/basic.json');
+  });
 
   describe('without output', () => {
     beforeEach((done) => {
diff --git a/spec/javascripts/notebook/cells/markdown_spec.js b/spec/javascripts/notebook/cells/markdown_spec.js
index 5c11272e7e0..38c976f38d8 100644
--- a/spec/javascripts/notebook/cells/markdown_spec.js
+++ b/spec/javascripts/notebook/cells/markdown_spec.js
@@ -1,14 +1,18 @@
 import Vue from 'vue';
 import MarkdownComponent from '~/notebook/cells/markdown.vue';
-import json from '../../fixtures/notebook/file.json';
 
-const cell = json.cells[1];
 const Component = Vue.extend(MarkdownComponent);
 
 describe('Markdown component', () => {
   let vm;
+  let cell;
+  let json;
 
   beforeEach((done) => {
+    json = getJSONFixture('blob/notebook/basic.json');
+
+    cell = json.cells[1];
+
     vm = new Component({
       propsData: {
         cell,
diff --git a/spec/javascripts/notebook/cells/output/index_spec.js b/spec/javascripts/notebook/cells/output/index_spec.js
index 7fe8d227f05..dbf79f85c7c 100644
--- a/spec/javascripts/notebook/cells/output/index_spec.js
+++ b/spec/javascripts/notebook/cells/output/index_spec.js
@@ -1,11 +1,11 @@
 import Vue from 'vue';
 import CodeComponent from '~/notebook/cells/output/index.vue';
-import json from '../../../fixtures/notebook/file.json';
 
 const Component = Vue.extend(CodeComponent);
 
 describe('Output component', () => {
   let vm;
+  let json;
 
   const createComponent = (output) => {
     vm = new Component({
@@ -17,6 +17,10 @@ describe('Output component', () => {
     vm.$mount();
   };
 
+  beforeEach(() => {
+    json = getJSONFixture('blob/notebook/basic.json');
+  });
+
   describe('text output', () => {
     beforeEach((done) => {
       createComponent(json.cells[2].outputs[0]);
diff --git a/spec/javascripts/notebook/index_spec.js b/spec/javascripts/notebook/index_spec.js
index 87f18b98342..bd63ab35426 100644
--- a/spec/javascripts/notebook/index_spec.js
+++ b/spec/javascripts/notebook/index_spec.js
@@ -1,12 +1,17 @@
 import Vue from 'vue';
 import Notebook from '~/notebook/index.vue';
-import json from '../fixtures/notebook/file.json';
-import jsonWithWorksheet from '../fixtures/notebook/worksheets.json';
 
 const Component = Vue.extend(Notebook);
 
 describe('Notebook component', () => {
   let vm;
+  let json;
+  let jsonWithWorksheet;
+
+  beforeEach(() => {
+    json = getJSONFixture('blob/notebook/basic.json');
+    jsonWithWorksheet = getJSONFixture('blob/notebook/worksheets.json');
+  });
 
   describe('without JSON', () => {
     beforeEach((done) => {
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 1b5cb71a6b0..af1defb5a2e 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -38,7 +38,8 @@ module TestEnv
     'deleted-image-test'                 => '6c17798',
     'wip'                                => 'b9238ee',
     'csv'                                => '3dd0896',
-    'v1.1.0'                             => 'b83d6e3'
+    'v1.1.0'                             => 'b83d6e3',
+    'add-ipython-files'                  => '6d85bb69'
   }.freeze
 
   # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily
-- 
cgit v1.2.3