1 files changed, 21 insertions, 1 deletions
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index f9ce77a44ba..7b576533ae5 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -1102,6 +1102,14 @@ RSpec.describe Projects::IssuesController, :request_store, feature_category: :te
       end
     end
 
+    context 'when trying to create an epic' do
+      it 'defaults to issue type' do
+        issue = post_new_issue(issue_type: 'epic')
+
+        expect(issue.work_item_type.base_type).to eq('issue')
+      end
+    end
+
     context 'when create service return an unrecoverable error with http_status' do
       let(:http_status) { 403 }
 
@@ -1786,7 +1794,19 @@ RSpec.describe Projects::IssuesController, :request_store, feature_category: :te
       it 'returns discussion json' do
         get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid }
 
-        expect(json_response.first.keys).to match_array(%w[id reply_id expanded notes diff_discussion discussion_path individual_note resolvable resolved resolved_at resolved_by resolved_by_push commit_id for_commit project_id confidential])
+        expect(json_response.first.keys).to match_array(%w[id reply_id expanded notes diff_discussion discussion_path individual_note resolvable commit_id for_commit project_id confidential resolve_path resolved resolved_at resolved_by resolved_by_push])
+      end
+
+      context 'when resolvable_issue_threads is disabled' do
+        before do
+          stub_feature_flags(resolvable_issue_threads: false)
+        end
+
+        it 'returns discussion json without resolved fields' do
+          get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid }
+
+          expect(json_response.first.keys).to match_array(%w[id reply_id expanded notes diff_discussion discussion_path individual_note resolvable commit_id for_commit project_id confidential])
+        end
       end
 
       it 'renders the author status html if there is a status' do