Add latest changes from gitlab-org/gitlab@master

4 files changed, 107 insertions, 1 deletions

diff --git a/spec/models/project_services/jira_tracker_data_spec.rb b/spec/models/project_services/jira_tracker_data_spec.rb
index 6cd3eb33d9b..12f6b99e8a7 100644
--- a/spec/models/project_services/jira_tracker_data_spec.rb
+++ b/spec/models/project_services/jira_tracker_data_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe JiraTrackerData do
-  let(:service) { create(:jira_service, active: false, properties: {}) }
+  let(:service) { create(:jira_service, active: false) }
 
   describe 'Associations' do
     it { is_expected.to belong_to(:service) }
diff --git a/spec/models/project_services/open_project_service_spec.rb b/spec/models/project_services/open_project_service_spec.rb
new file mode 100644
index 00000000000..8e373a31e62
--- /dev/null
+++ b/spec/models/project_services/open_project_service_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe OpenProjectService do
+  describe 'Validations' do
+    context 'when service is active' do
+      before do
+        subject.active = true
+      end
+
+      it { is_expected.to validate_presence_of(:url) }
+      it { is_expected.to validate_presence_of(:token) }
+      it { is_expected.to validate_presence_of(:project_identifier_code) }
+
+      it_behaves_like 'issue tracker service URL attribute', :url
+      it_behaves_like 'issue tracker service URL attribute', :api_url
+    end
+
+    context 'when service is inactive' do
+      before do
+        subject.active = false
+      end
+
+      it { is_expected.not_to validate_presence_of(:url) }
+      it { is_expected.not_to validate_presence_of(:token) }
+      it { is_expected.not_to validate_presence_of(:project_identifier_code) }
+    end
+  end
+
+  describe 'Associations' do
+    it { is_expected.to belong_to :project }
+    it { is_expected.to have_one :service_hook }
+  end
+end
diff --git a/spec/models/project_services/open_project_tracker_data_spec.rb b/spec/models/project_services/open_project_tracker_data_spec.rb
new file mode 100644
index 00000000000..0d387bbf69b
--- /dev/null
+++ b/spec/models/project_services/open_project_tracker_data_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe OpenProjectTrackerData do
+  describe 'Associations' do
+    it { is_expected.to belong_to(:service) }
+  end
+
+  describe 'closed_status_id' do
+    it 'returns the set value' do
+      expect(build(:open_project_tracker_data).closed_status_id).to eq('15')
+    end
+
+    it 'returns the default value if not set' do
+      expect(build(:open_project_tracker_data, closed_status_id: nil).closed_status_id).to eq('13')
+    end
+  end
+end
diff --git a/spec/models/terraform/state_spec.rb b/spec/models/terraform/state_spec.rb
new file mode 100644
index 00000000000..1d677e7ece5
--- /dev/null
+++ b/spec/models/terraform/state_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Terraform::State do
+  subject { create(:terraform_state, :with_file) }
+
+  it { is_expected.to belong_to(:project) }
+
+  it { is_expected.to validate_presence_of(:project_id) }
+
+  before do
+    stub_terraform_state_object_storage(Terraform::StateUploader)
+  end
+
+  describe '#file_store' do
+    context 'when no value is set' do
+      it 'returns the default store of the uploader' do
+        [ObjectStorage::Store::LOCAL, ObjectStorage::Store::REMOTE].each do |store|
+          expect(Terraform::StateUploader).to receive(:default_store).and_return(store)
+          expect(described_class.new.file_store).to eq(store)
+        end
+      end
+    end
+
+    context 'when a value is set' do
+      it 'returns the value' do
+        [ObjectStorage::Store::LOCAL, ObjectStorage::Store::REMOTE].each do |store|
+          expect(build(:terraform_state, file_store: store).file_store).to eq(store)
+        end
+      end
+    end
+  end
+
+  describe '#update_file_store' do
+    context 'when file is stored in object storage' do
+      it 'sets file_store to remote' do
+        expect(subject.file_store).to eq(ObjectStorage::Store::REMOTE)
+      end
+    end
+
+    context 'when file is stored locally' do
+      before do
+        stub_terraform_state_object_storage(Terraform::StateUploader, enabled: false)
+      end
+
+      it 'sets file_store to local' do
+        expect(subject.file_store).to eq(ObjectStorage::Store::LOCAL)
+      end
+    end
+  end
+end