Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/models/project_services/data_fields_spec.rb b/spec/models/project_services/data_fields_spec.rb
index 146db0ae227..6b388a7222b 100644
--- a/spec/models/project_services/data_fields_spec.rb
+++ b/spec/models/project_services/data_fields_spec.rb
@@ -74,6 +74,12 @@ describe DataFields do
         expect(service.url_changed?).to be_falsy
       end
     end
+
+    describe 'data_fields_present?' do
+      it 'returns true from the issue tracker service' do
+        expect(service.data_fields_present?).to be true
+      end
+    end
   end
 
   context 'when data are stored in data_fields' do
@@ -92,6 +98,18 @@ describe DataFields do
     end
   end
 
+  context 'when service and data_fields are not persisted' do
+    let(:service) do
+      JiraService.new
+    end
+
+    describe 'data_fields_present?' do
+      it 'returns true' do
+        expect(service.data_fields_present?).to be true
+      end
+    end
+  end
+
   context 'when data are stored in properties' do
     let(:service) { create(:jira_service, :without_properties_callback, properties: properties) }