Merge branch 'merge-request-tabs-fixture' into 'master'

changelogs/unreleased/merge-request-tabs-fixture.yml

+---
+title: Replace static fixture for merge_request_tabs_spec.js
+merge_request: 9172
+author: winniehell

spec/javascripts/fixtures/merge_request_tabs.html.haml

-%ul.nav.nav-tabs.merge-request-tabs
-  %li.notes-tab
-    %a{href: '/foo/bar/merge_requests/1', data: {target: 'div#notes', action: 'notes', toggle: 'tab'}}
-      Discussion
-  %li.commits-tab
-    %a{href: '/foo/bar/merge_requests/1/commits', data: {target: 'div#commits', action: 'commits', toggle: 'tab'}}
-      Commits
-  %li.diffs-tab
-    %a{href: '/foo/bar/merge_requests/1/diffs', data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'}}
-      Diffs
-
-.tab-content
-  #notes.notes.tab-pane
-    Notes Content
-  #commits.commits.tab-pane
-    Commits Content
-  #diffs.diffs.tab-pane
-    Diffs Content
-
-.mr-loading-status
-  .loading
-    Loading Animation

spec/javascripts/fixtures/merge_requests.rb

+require 'spec_helper'
+
+describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :controller do
+  include JavaScriptFixturesHelpers
+
+  let(:admin) { create(:admin) }
+  let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
+  let(:project) { create(:project, namespace: namespace, path: 'merge-requests-project') }
+
+  render_views
+
+  before(:all) do
+    clean_frontend_fixtures('merge_requests/')
+  end
+
+  before(:each) do
+    sign_in(admin)
+  end
+
+  it 'merge_requests/merge_request_with_task_list.html.raw' do |example|
+    merge_request = create(:merge_request, :with_diffs, source_project: project, target_project: project, description: '- [ ] Task List Item')
+    render_merge_request(example.description, merge_request)
+  end
+
+  private
+
+  def render_merge_request(fixture_file_name, merge_request)
+    get :show,
+      namespace_id: project.namespace.to_param,
+      project_id: project.to_param,
+      id: merge_request.to_param
+
+    expect(response).to be_success
+    store_frontend_fixture(response, fixture_file_name)
+  end
+end

spec/javascripts/merge_request_tabs_spec.js

@@ -25,7 +25,7 @@ require('vendor/jquery.scrollTo');
       };
       $.extend(stubLocation, defaults, stubs || {});
     };
-    preloadFixtures('static/merge_request_tabs.html.raw');
+    preloadFixtures('merge_requests/merge_request_with_task_list.html.raw');
 
     beforeEach(function () {
       this.class = new gl.MergeRequestTabs({ stubLocation: stubLocation });
@@ -41,7 +41,7 @@ require('vendor/jquery.scrollTo');
     describe('#activateTab', function () {
       beforeEach(function () {
         spyOn($, 'ajax').and.callFake(function () {});
-        loadFixtures('static/merge_request_tabs.html.raw');
+        loadFixtures('merge_requests/merge_request_with_task_list.html.raw');
         this.subject = this.class.activateTab;
       });
       it('shows the first tab when action is show', function () {