Add latest changes from gitlab-org/gitlab@master

4 files changed, 53 insertions, 8 deletions

diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 3ec6110d789..523e17f82c1 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -34,6 +34,10 @@ describe ApplicationSetting do
     it { is_expected.to allow_value("dev.gitlab.com").for(:commit_email_hostname) }
     it { is_expected.not_to allow_value("@dev.gitlab").for(:commit_email_hostname) }
 
+    it { is_expected.to allow_value(true).for(:container_expiration_policies_enable_historic_entries) }
+    it { is_expected.to allow_value(false).for(:container_expiration_policies_enable_historic_entries) }
+    it { is_expected.not_to allow_value(nil).for(:container_expiration_policies_enable_historic_entries) }
+
     it { is_expected.to allow_value("myemail@gitlab.com").for(:lets_encrypt_notification_email) }
     it { is_expected.to allow_value(nil).for(:lets_encrypt_notification_email) }
     it { is_expected.not_to allow_value("notanemail").for(:lets_encrypt_notification_email) }
diff --git a/spec/models/ci/group_spec.rb b/spec/models/ci/group_spec.rb
index b3b158a111e..5516a1a9c61 100644
--- a/spec/models/ci/group_spec.rb
+++ b/spec/models/ci/group_spec.rb
@@ -53,7 +53,7 @@ describe Ci::Group do
       it 'calls the status from the object itself' do
         expect(jobs.first).to receive(:detailed_status)
 
-        expect(subject.detailed_status(double(:user)))
+        subject.detailed_status(double(:user))
       end
     end
 
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index 55af292e8f3..b8034ba5bf2 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -526,14 +526,14 @@ describe Ci::Runner do
     it 'sets a new last_update value when it is called the first time' do
       last_update = runner.ensure_runner_queue_value
 
-      expect_value_in_queues.to eq(last_update)
+      expect(value_in_queues).to eq(last_update)
     end
 
     it 'does not change if it is not expired and called again' do
       last_update = runner.ensure_runner_queue_value
 
       expect(runner.ensure_runner_queue_value).to eq(last_update)
-      expect_value_in_queues.to eq(last_update)
+      expect(value_in_queues).to eq(last_update)
     end
 
     context 'updates runner queue after changing editable value' do
@@ -544,7 +544,7 @@ describe Ci::Runner do
       end
 
       it 'sets a new last_update value' do
-        expect_value_in_queues.not_to eq(last_update)
+        expect(value_in_queues).not_to eq(last_update)
       end
     end
 
@@ -556,14 +556,14 @@ describe Ci::Runner do
       end
 
       it 'has an old last_update value' do
-        expect_value_in_queues.to eq(last_update)
+        expect(value_in_queues).to eq(last_update)
       end
     end
 
-    def expect_value_in_queues
+    def value_in_queues
       Gitlab::Redis::SharedState.with do |redis|
         runner_queue_key = runner.send(:runner_queue_key)
-        expect(redis.get(runner_queue_key))
+        redis.get(runner_queue_key)
       end
     end
   end
diff --git a/spec/models/users_statistics_spec.rb b/spec/models/users_statistics_spec.rb
index fc23bed711f..4437a5469c6 100644
--- a/spec/models/users_statistics_spec.rb
+++ b/spec/models/users_statistics_spec.rb
@@ -2,7 +2,36 @@
 
 require 'spec_helper'
 
-RSpec.describe UsersStatistics do
+describe UsersStatistics do
+  let(:users_statistics) { build(:users_statistics) }
+
+  describe 'scopes' do
+    describe '.order_created_at_desc' do
+      it 'returns the entries ordered by created at descending' do
+        users_statistics1 = create(:users_statistics, created_at: Time.current)
+        users_statistics2 = create(:users_statistics, created_at: Time.current - 2.days)
+        users_statistics3 = create(:users_statistics, created_at: Time.current - 5.hours)
+
+        expect(described_class.order_created_at_desc).to eq(
+          [
+            users_statistics1,
+            users_statistics3,
+            users_statistics2
+          ]
+        )
+      end
+    end
+  end
+
+  describe '.latest' do
+    it 'returns the latest entry' do
+      create(:users_statistics, created_at: Time.current - 1.day)
+      users_statistics = create(:users_statistics, created_at: Time.current)
+
+      expect(described_class.latest).to eq(users_statistics)
+    end
+  end
+
   describe '.create_current_stats!' do
     before do
       create_list(:user_highest_role, 4)
@@ -40,4 +69,16 @@ RSpec.describe UsersStatistics do
       end
     end
   end
+
+  describe '#active' do
+    it 'sums users statistics values without the value for blocked' do
+      expect(users_statistics.active).to eq(71)
+    end
+  end
+
+  describe '#total' do
+    it 'sums all users statistics values' do
+      expect(users_statistics.total).to eq(78)
+    end
+  end
 end