4 files changed, 109 insertions, 10 deletions

diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 13a4aaa8936..b07f8bc98b5 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -1511,11 +1511,11 @@ describe Ci::Build do
     end
   end
 
-  describe '#other_actions' do
+  describe '#other_manual_actions' do
     let(:build) { create(:ci_build, :manual, pipeline: pipeline) }
     let!(:other_build) { create(:ci_build, :manual, pipeline: pipeline, name: 'other action') }
 
-    subject { build.other_actions }
+    subject { build.other_manual_actions }
 
     before do
       project.add_developer(user)
@@ -1546,6 +1546,48 @@ describe Ci::Build do
     end
   end
 
+  describe '#other_scheduled_actions' do
+    let(:build) { create(:ci_build, :scheduled, pipeline: pipeline) }
+
+    subject { build.other_scheduled_actions }
+
+    before do
+      project.add_developer(user)
+    end
+
+    context "when other build's status is success" do
+      let!(:other_build) { create(:ci_build, :schedulable, :success, pipeline: pipeline, name: 'other action') }
+
+      it 'returns other actions' do
+        is_expected.to contain_exactly(other_build)
+      end
+    end
+
+    context "when other build's status is failed" do
+      let!(:other_build) { create(:ci_build, :schedulable, :failed, pipeline: pipeline, name: 'other action') }
+
+      it 'returns other actions' do
+        is_expected.to contain_exactly(other_build)
+      end
+    end
+
+    context "when other build's status is running" do
+      let!(:other_build) { create(:ci_build, :schedulable, :running, pipeline: pipeline, name: 'other action') }
+
+      it 'does not return other actions' do
+        is_expected.to be_empty
+      end
+    end
+
+    context "when other build's status is scheduled" do
+      let!(:other_build) { create(:ci_build, :scheduled, pipeline: pipeline, name: 'other action') }
+
+      it 'does not return other actions' do
+        is_expected.to contain_exactly(other_build)
+      end
+    end
+  end
+
   describe '#persisted_environment' do
     let!(:environment) do
       create(:environment, project: project, name: "foo-#{project.default_branch}")
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index b8364e0cf88..146d35122f7 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -16,6 +16,22 @@ describe Deployment do
   it { is_expected.to validate_presence_of(:ref) }
   it { is_expected.to validate_presence_of(:sha) }
 
+  describe '#scheduled_actions' do
+    subject { deployment.scheduled_actions }
+
+    let(:project) { create(:project, :repository) }
+    let(:pipeline) { create(:ci_pipeline, project: project) }
+    let(:build) { create(:ci_build, :success, pipeline: pipeline) }
+    let(:deployment) { create(:deployment, deployable: build) }
+
+    it 'delegates to other_scheduled_actions' do
+      expect_any_instance_of(Ci::Build)
+        .to receive(:other_scheduled_actions)
+
+      subject
+    end
+  end
+
   describe 'modules' do
     it_behaves_like 'AtomicInternalId' do
       let(:internal_id_attribute) { :iid }
diff --git a/spec/models/postgresql/replication_slot_spec.rb b/spec/models/postgresql/replication_slot_spec.rb
index 919a7526803..e100af7ddc7 100644
--- a/spec/models/postgresql/replication_slot_spec.rb
+++ b/spec/models/postgresql/replication_slot_spec.rb
@@ -3,7 +3,27 @@
 require 'spec_helper'
 
 describe Postgresql::ReplicationSlot, :postgresql do
+  describe '.in_use?' do
+    it 'returns true when replication slots are present' do
+      expect(described_class).to receive(:exists?).and_return(true)
+      expect(described_class.in_use?).to be_truthy
+    end
+
+    it 'returns false when replication slots are not present' do
+      expect(described_class.in_use?).to be_falsey
+    end
+
+    it 'returns false if the existence check is invalid' do
+      expect(described_class).to receive(:exists?).and_raise(ActiveRecord::StatementInvalid.new('PG::FeatureNotSupported'))
+      expect(described_class.in_use?).to be_falsey
+    end
+  end
+
   describe '.lag_too_great?' do
+    before do
+      expect(described_class).to receive(:in_use?).and_return(true)
+    end
+
     it 'returns true when replication lag is too great' do
       expect(described_class)
         .to receive(:pluck)
diff --git a/spec/models/user_preference_spec.rb b/spec/models/user_preference_spec.rb
index 64d9d9a78b4..2898613545c 100644
--- a/spec/models/user_preference_spec.rb
+++ b/spec/models/user_preference_spec.rb
@@ -6,22 +6,43 @@ describe UserPreference do
   describe '#set_notes_filter' do
     let(:issuable) { build_stubbed(:issue) }
     let(:user_preference) { create(:user_preference) }
-    let(:only_comments) { described_class::NOTES_FILTERS[:only_comments] }
 
-    it 'returns updated discussion filter' do
-      filter_name =
-        user_preference.set_notes_filter(only_comments, issuable)
+    shared_examples 'setting system notes' do
+      it 'returns updated discussion filter' do
+        filter_name =
+          user_preference.set_notes_filter(filter, issuable)
+
+        expect(filter_name).to eq(filter)
+      end
+
+      it 'updates discussion filter for issuable class' do
+        user_preference.set_notes_filter(filter, issuable)
+
+        expect(user_preference.reload.issue_notes_filter).to eq(filter)
+      end
+    end
+
+    context 'when filter is set to all notes' do
+      let(:filter) { described_class::NOTES_FILTERS[:all_notes] }
+
+      it_behaves_like 'setting system notes'
+    end
+
+    context 'when filter is set to only comments' do
+      let(:filter) { described_class::NOTES_FILTERS[:only_comments] }
 
-      expect(filter_name).to eq(only_comments)
+      it_behaves_like 'setting system notes'
     end
 
-    it 'updates discussion filter for issuable class' do
-      user_preference.set_notes_filter(only_comments, issuable)
+    context 'when filter is set to only activity' do
+      let(:filter) { described_class::NOTES_FILTERS[:only_activity] }
 
-      expect(user_preference.reload.issue_notes_filter).to eq(only_comments)
+      it_behaves_like 'setting system notes'
     end
 
     context 'when notes_filter parameter is invalid' do
+      let(:only_comments) { described_class::NOTES_FILTERS[:only_comments] }
+
       it 'returns the current notes filter' do
         user_preference.set_notes_filter(only_comments, issuable)