Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactor

5 files changed, 66 insertions, 48 deletions

diff --git a/spec/javascripts/behaviors/quick_submit_spec.js b/spec/javascripts/behaviors/quick_submit_spec.js
index 1541037888f..0e4c2c560cc 100644
--- a/spec/javascripts/behaviors/quick_submit_spec.js
+++ b/spec/javascripts/behaviors/quick_submit_spec.js
@@ -5,73 +5,83 @@ require('~/behaviors/quick_submit');
 (function() {
   describe('Quick Submit behavior', function() {
     var keydownEvent;
-    preloadFixtures('static/behaviors/quick_submit.html.raw');
+    preloadFixtures('issues/open-issue.html.raw');
     beforeEach(function() {
-      loadFixtures('static/behaviors/quick_submit.html.raw');
+      loadFixtures('issues/open-issue.html.raw');
       $('form').submit(function(e) {
         // Prevent a form submit from moving us off the testing page
         return e.preventDefault();
       });
-      return this.spies = {
+      this.spies = {
         submit: spyOnEvent('form', 'submit')
       };
+
+      this.textarea = $('.js-quick-submit textarea').first();
     });
     it('does not respond to other keyCodes', function() {
-      $('input.quick-submit-input').trigger(keydownEvent({
+      this.textarea.trigger(keydownEvent({
         keyCode: 32
       }));
       return expect(this.spies.submit).not.toHaveBeenTriggered();
     });
     it('does not respond to Enter alone', function() {
-      $('input.quick-submit-input').trigger(keydownEvent({
+      this.textarea.trigger(keydownEvent({
         ctrlKey: false,
         metaKey: false
       }));
       return expect(this.spies.submit).not.toHaveBeenTriggered();
     });
     it('does not respond to repeated events', function() {
-      $('input.quick-submit-input').trigger(keydownEvent({
+      this.textarea.trigger(keydownEvent({
         repeat: true
       }));
       return expect(this.spies.submit).not.toHaveBeenTriggered();
     });
-    it('disables submit buttons', function() {
-      $('textarea').trigger(keydownEvent());
-      expect($('input[type=submit]')).toBeDisabled();
-      return expect($('button[type=submit]')).toBeDisabled();
+    it('disables input of type submit', function() {
+      const submitButton = $('.js-quick-submit input[type=submit]');
+      this.textarea.trigger(keydownEvent());
+      expect(submitButton).toBeDisabled();
+    });
+    it('disables button of type submit', function() {
+      // button doesn't exist in fixture, add it manually
+      const submitButton = $('<button type="submit">Submit it</button>');
+      submitButton.insertAfter(this.textarea);
+
+      this.textarea.trigger(keydownEvent());
+      expect(submitButton).toBeDisabled();
     });
     // We cannot stub `navigator.userAgent` for CI's `rake karma` task, so we'll
     // only run the tests that apply to the current platform
     if (navigator.userAgent.match(/Macintosh/)) {
       it('responds to Meta+Enter', function() {
-        $('input.quick-submit-input').trigger(keydownEvent());
+        this.textarea.trigger(keydownEvent());
         return expect(this.spies.submit).toHaveBeenTriggered();
       });
       it('excludes other modifier keys', function() {
-        $('input.quick-submit-input').trigger(keydownEvent({
+        this.textarea.trigger(keydownEvent({
           altKey: true
         }));
-        $('input.quick-submit-input').trigger(keydownEvent({
+        this.textarea.trigger(keydownEvent({
           ctrlKey: true
         }));
-        $('input.quick-submit-input').trigger(keydownEvent({
+        this.textarea.trigger(keydownEvent({
           shiftKey: true
         }));
         return expect(this.spies.submit).not.toHaveBeenTriggered();
       });
     } else {
       it('responds to Ctrl+Enter', function() {
-        $('input.quick-submit-input').trigger(keydownEvent());
+        this.textarea.trigger(keydownEvent());
         return expect(this.spies.submit).toHaveBeenTriggered();
       });
       it('excludes other modifier keys', function() {
-        $('input.quick-submit-input').trigger(keydownEvent({
+        this.textarea.trigger(keydownEvent({
           altKey: true
         }));
-        $('input.quick-submit-input').trigger(keydownEvent({
+        this.textarea.trigger(keydownEvent({
           metaKey: true
         }));
-        $('input.quick-submit-input').trigger(keydownEvent({
+        this.textarea.trigger(keydownEvent({
           shiftKey: true
         }));
         return expect(this.spies.submit).not.toHaveBeenTriggered();
diff --git a/spec/javascripts/fixtures/behaviors/quick_submit.html.haml b/spec/javascripts/fixtures/behaviors/quick_submit.html.haml
deleted file mode 100644
index dc2ceed42f4..00000000000
--- a/spec/javascripts/fixtures/behaviors/quick_submit.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-%form.js-quick-submit{ action: '/foo' }
-  %input{ type: 'text', class: 'quick-submit-input'}
-  %textarea
-
-  %input{ type: 'submit'} Submit
-  %button.btn{ type: 'submit' } Submit
diff --git a/spec/javascripts/fixtures/merge_request_tabs.html.haml b/spec/javascripts/fixtures/merge_request_tabs.html.haml
deleted file mode 100644
index 68678c3d7e3..00000000000
--- a/spec/javascripts/fixtures/merge_request_tabs.html.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-%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
diff --git a/spec/javascripts/fixtures/merge_requests.rb b/spec/javascripts/fixtures/merge_requests.rb
new file mode 100644
index 00000000000..62984097099
--- /dev/null
+++ b/spec/javascripts/fixtures/merge_requests.rb
@@ -0,0 +1,36 @@
+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
diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js
index 92a0f1c05f7..3810991f104 100644
--- a/spec/javascripts/merge_request_tabs_spec.js
+++ b/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 () {