Merge branch 'master' into notebooklab-in-repo

3 files changed, 249 insertions, 1 deletions

diff --git a/spec/support/features/discussion_comments_shared_example.rb b/spec/support/features/discussion_comments_shared_example.rb
new file mode 100644
index 00000000000..1a061ef069e
--- /dev/null
+++ b/spec/support/features/discussion_comments_shared_example.rb
@@ -0,0 +1,213 @@
+shared_examples 'discussion comments' do |resource_name|
+  let(:form_selector) { '.js-main-target-form' }
+  let(:dropdown_selector) { "#{form_selector} .comment-type-dropdown" }
+  let(:toggle_selector) { "#{dropdown_selector} .dropdown-toggle" }
+  let(:menu_selector) { "#{dropdown_selector} .dropdown-menu" }
+  let(:submit_selector) { "#{form_selector} .js-comment-submit-button" }
+  let(:close_selector) { "#{form_selector} .btn-comment-and-close" }
+  let(:comments_selector) { '.timeline > .note.timeline-entry' }
+
+  it 'clicking "Comment" will post a comment' do
+    expect(page).to have_selector toggle_selector
+
+    find("#{form_selector} .note-textarea").send_keys('a')
+
+    find(submit_selector).click
+
+    find(comments_selector, match: :first)
+    new_comment = all(comments_selector).last
+
+    expect(new_comment).to have_content 'a'
+    expect(new_comment).not_to have_selector '.discussion'
+  end
+
+  if resource_name == 'issue'
+    it "clicking 'Comment & close #{resource_name}' will post a comment and close the #{resource_name}" do
+      find("#{form_selector} .note-textarea").send_keys('a')
+
+      find(close_selector).click
+
+      find(comments_selector, match: :first)
+      find("#{comments_selector}.system-note")
+      entries = all(comments_selector)
+      close_note = entries.last
+      new_comment = entries[-2]
+
+      expect(close_note).to have_content 'closed'
+      expect(new_comment).not_to have_selector '.discussion'
+    end
+  end
+
+  describe 'when the toggle is clicked' do
+    before do
+      find("#{form_selector} .note-textarea").send_keys('a')
+
+      find(toggle_selector).click
+    end
+
+    it 'has a "Comment" item (selected by default) and "Start discussion" item' do
+      expect(page).to have_selector menu_selector
+
+      find("#{menu_selector} li", match: :first)
+      items = all("#{menu_selector} li")
+
+      expect(items.first).to have_content 'Comment'
+      expect(items.first).to have_content "Add a general comment to this #{resource_name}."
+      expect(items.first).to have_selector '.fa-check'
+      expect(items.first['class']).to match 'droplab-item-selected'
+
+      expect(items.last).to have_content 'Start discussion'
+      expect(items.last).to have_content "Discuss a specific suggestion or question#{' that needs to be resolved' if resource_name == 'merge request'}."
+      expect(items.last).not_to have_selector '.fa-check'
+      expect(items.last['class']).not_to match 'droplab-item-selected'
+    end
+
+    it 'closes the menu when clicking the toggle or body' do
+      find(toggle_selector).click
+
+      expect(page).not_to have_selector menu_selector
+
+      find(toggle_selector).click
+      find('body').click
+
+      expect(page).not_to have_selector menu_selector
+    end
+
+    it 'clicking the ul padding should not change the text' do
+      find(menu_selector).trigger 'click'
+
+      expect(find(dropdown_selector)).to have_content 'Comment'
+    end
+
+    describe 'when selecting "Start discussion"' do
+      before do
+        find("#{menu_selector} li", match: :first)
+        all("#{menu_selector} li").last.click
+      end
+
+      it 'updates the submit button text, note_type input and closes the dropdown' do
+        expect(find(dropdown_selector)).to have_content 'Start discussion'
+        expect(find("#{form_selector} #note_type", visible: false).value).to eq('DiscussionNote')
+        expect(page).not_to have_selector menu_selector
+      end
+
+      if resource_name =~ /(issue|merge request)/
+        it 'updates the close button text' do
+          expect(find(close_selector)).to have_content "Start discussion & close #{resource_name}"
+        end
+
+        it 'typing does not change the close button text' do
+          find("#{form_selector} .note-textarea").send_keys('b')
+
+          expect(find(close_selector)).to have_content "Start discussion & close #{resource_name}"
+        end
+      end
+
+      it 'clicking "Start discussion" will post a discussion' do
+        find(submit_selector).click
+
+        find(comments_selector, match: :first)
+        new_comment = all(comments_selector).last
+
+        expect(new_comment).to have_content 'a'
+        expect(new_comment).to have_selector '.discussion'
+      end
+
+      if resource_name == 'issue'
+        it "clicking 'Start discussion & close #{resource_name}' will post a discussion and close the #{resource_name}" do
+          find(close_selector).click
+
+          find(comments_selector, match: :first)
+          find("#{comments_selector}.system-note")
+          entries = all(comments_selector)
+          close_note = entries.last
+          new_discussion = entries[-2]
+
+          expect(close_note).to have_content 'closed'
+          expect(new_discussion).to have_selector '.discussion'
+        end
+      end
+
+      describe 'when opening the menu' do
+        before do
+          find(toggle_selector).click
+        end
+
+        it 'should have "Start discussion" selected' do
+          find("#{menu_selector} li", match: :first)
+          items = all("#{menu_selector} li")
+
+          expect(items.first).to have_content 'Comment'
+          expect(items.first).not_to have_selector '.fa-check'
+          expect(items.first['class']).not_to match 'droplab-item-selected'
+
+          expect(items.last).to have_content 'Start discussion'
+          expect(items.last).to have_selector '.fa-check'
+          expect(items.last['class']).to match 'droplab-item-selected'
+        end
+
+        describe 'when selecting "Comment"' do
+          before do
+            find("#{menu_selector} li", match: :first).click
+          end
+
+          it 'updates the submit button text, clears the note_type input and closes the dropdown' do
+            expect(find(dropdown_selector)).to have_content 'Comment'
+            expect(find("#{form_selector} #note_type", visible: false).value).to eq('')
+            expect(page).not_to have_selector menu_selector
+          end
+
+          if resource_name =~ /(issue|merge request)/
+            it 'updates the close button text' do
+              expect(find(close_selector)).to have_content "Comment & close #{resource_name}"
+            end
+
+            it 'typing does not change the close button text' do
+              find("#{form_selector} .note-textarea").send_keys('b')
+
+              expect(find(close_selector)).to have_content "Comment & close #{resource_name}"
+            end
+          end
+
+          it 'should have "Comment" selected when opening the menu' do
+            find(toggle_selector).click
+
+            find("#{menu_selector} li", match: :first)
+            items = all("#{menu_selector} li")
+
+            expect(items.first).to have_content 'Comment'
+            expect(items.first).to have_selector '.fa-check'
+            expect(items.first['class']).to match 'droplab-item-selected'
+
+            expect(items.last).to have_content 'Start discussion'
+            expect(items.last).not_to have_selector '.fa-check'
+            expect(items.last['class']).not_to match 'droplab-item-selected'
+          end
+        end
+      end
+    end
+  end
+
+  if resource_name =~ /(issue|merge request)/
+    describe "on a closed #{resource_name}" do
+      before do
+        find("#{form_selector} .js-note-target-close").click
+
+        find("#{form_selector} .note-textarea").send_keys('a')
+      end
+
+      it "should show a 'Comment & reopen #{resource_name}' button" do
+        expect(find("#{form_selector} .js-note-target-reopen")).to have_content "Comment & reopen #{resource_name}"
+      end
+
+      it "should show a 'Start discussion & reopen #{resource_name}' button when 'Start discussion' is selected" do
+        find(toggle_selector).click
+
+        find("#{menu_selector} li", match: :first)
+        all("#{menu_selector} li").last.click
+
+        expect(find("#{form_selector} .js-note-target-reopen")).to have_content "Start discussion & reopen #{resource_name}"
+      end
+    end
+  end
+end
diff --git a/spec/support/gitaly.rb b/spec/support/gitaly.rb
new file mode 100644
index 00000000000..7aca902fc61
--- /dev/null
+++ b/spec/support/gitaly.rb
@@ -0,0 +1,7 @@
+if Gitlab::GitalyClient.enabled?
+  RSpec.configure do |config|
+    config.before(:each) do
+      allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(true)
+    end
+  end
+end
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index af1defb5a2e..eb0f1efe55b 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -65,6 +65,8 @@ module TestEnv
     # Setup GitLab shell for test instance
     setup_gitlab_shell
 
+    setup_gitaly if Gitlab::GitalyClient.enabled?
+
     # Create repository for FactoryGirl.create(:project)
     setup_factory_repo
 
@@ -72,6 +74,10 @@ module TestEnv
     setup_forked_repo
   end
 
+  def cleanup
+    stop_gitaly
+  end
+
   def disable_mailer
     allow_any_instance_of(NotificationService).to receive(:mailer).
       and_return(double.as_null_object)
@@ -93,7 +99,7 @@ module TestEnv
     tmp_test_path = Rails.root.join('tmp', 'tests', '**')
 
     Dir[tmp_test_path].each do |entry|
-      unless File.basename(entry) =~ /\Agitlab-(shell|test|test_bare|test-fork|test-fork_bare)\z/
+      unless File.basename(entry) =~ /\A(gitaly|gitlab-(shell|test|test_bare|test-fork|test-fork_bare))\z/
         FileUtils.rm_rf(entry)
       end
     end
@@ -111,6 +117,28 @@ module TestEnv
     end
   end
 
+  def setup_gitaly
+    socket_path = Gitlab::GitalyClient.get_address('default').sub(/\Aunix:/, '')
+    gitaly_dir = File.dirname(socket_path)
+
+    unless File.directory?(gitaly_dir) || system('rake', "gitlab:gitaly:install[#{gitaly_dir}]")
+      raise "Can't clone gitaly"
+    end
+
+    start_gitaly(gitaly_dir, socket_path)
+  end
+
+  def start_gitaly(gitaly_dir, socket_path)
+    gitaly_exec = File.join(gitaly_dir, 'gitaly')
+    @gitaly_pid = spawn({ "GITALY_SOCKET_PATH" => socket_path }, gitaly_exec, [:out, :err] => '/dev/null')
+  end
+
+  def stop_gitaly
+    return unless @gitaly_pid
+
+    Process.kill('KILL', @gitaly_pid)
+  end
+
   def setup_factory_repo
     setup_repo(factory_repo_path, factory_repo_path_bare, factory_repo_name,
                BRANCH_SHA)