From 5ee6e620ab2b84d326a3b4c558cac8352b8b7771 Mon Sep 17 00:00:00 2001
From: Michel Engelen <michel@nomorejs.net>
Date: Wed, 26 Jun 2019 13:57:34 +0200
Subject: updated tests to comply with the corresponding EE branch

---
 spec/features/discussion_comments/commit_spec.rb            | 4 ++--
 spec/features/discussion_comments/issue_spec.rb             | 4 ++--
 spec/features/discussion_comments/merge_request_spec.rb     | 4 ++--
 spec/features/discussion_comments/snippets_spec.rb          | 4 ++--
 spec/support/features/discussion_comments_shared_example.rb | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/features/discussion_comments/commit_spec.rb b/spec/features/discussion_comments/commit_spec.rb
index 7a3b1d7ed47..0931563c201 100644
--- a/spec/features/discussion_comments/commit_spec.rb
+++ b/spec/features/discussion_comments/commit_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Discussion Comments Commit', :js do
+describe 'Thread Comments Commit', :js do
   include RepoHelpers
 
   let(:user) { create(:user) }
@@ -14,5 +14,5 @@ describe 'Discussion Comments Commit', :js do
     visit project_commit_path(project, sample_commit.id)
   end
 
-  it_behaves_like 'discussion comments', 'commit'
+  it_behaves_like 'thread comments', 'commit'
 end
diff --git a/spec/features/discussion_comments/issue_spec.rb b/spec/features/discussion_comments/issue_spec.rb
index 5ec19460bbd..d71a1ee4731 100644
--- a/spec/features/discussion_comments/issue_spec.rb
+++ b/spec/features/discussion_comments/issue_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Discussion Comments Issue', :js do
+describe 'Thread Comments Issue', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:issue) { create(:issue, project: project) }
@@ -12,5 +12,5 @@ describe 'Discussion Comments Issue', :js do
     visit project_issue_path(project, issue)
   end
 
-  it_behaves_like 'discussion comments', 'issue'
+  it_behaves_like 'thread comments', 'issue'
 end
diff --git a/spec/features/discussion_comments/merge_request_spec.rb b/spec/features/discussion_comments/merge_request_spec.rb
index f940e973923..86e3507a3ee 100644
--- a/spec/features/discussion_comments/merge_request_spec.rb
+++ b/spec/features/discussion_comments/merge_request_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Discussion Comments Merge Request', :js do
+describe 'Thread Comments Merge Request', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:merge_request) { create(:merge_request, source_project: project) }
@@ -12,5 +12,5 @@ describe 'Discussion Comments Merge Request', :js do
     visit project_merge_request_path(project, merge_request)
   end
 
-  it_behaves_like 'discussion comments', 'merge request'
+  it_behaves_like 'thread comments', 'merge request'
 end
diff --git a/spec/features/discussion_comments/snippets_spec.rb b/spec/features/discussion_comments/snippets_spec.rb
index d330e89505e..29aa3e4366c 100644
--- a/spec/features/discussion_comments/snippets_spec.rb
+++ b/spec/features/discussion_comments/snippets_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Discussion Comments Snippet', :js do
+describe 'Thread Comments Snippet', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:snippet) { create(:project_snippet, :private, project: project, author: user) }
@@ -12,5 +12,5 @@ describe 'Discussion Comments Snippet', :js do
     visit project_snippet_path(project, snippet)
   end
 
-  it_behaves_like 'discussion comments', 'snippet'
+  it_behaves_like 'thread comments', 'snippet'
 end
diff --git a/spec/support/features/discussion_comments_shared_example.rb b/spec/support/features/discussion_comments_shared_example.rb
index 4a85fd75d46..2bff1e3557a 100644
--- a/spec/support/features/discussion_comments_shared_example.rb
+++ b/spec/support/features/discussion_comments_shared_example.rb
@@ -1,4 +1,4 @@
-shared_examples 'discussion comments' do |resource_name|
+shared_examples 'thread 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" }
-- 
cgit v1.2.1