Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 9 deletions

diff --git a/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb b/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb
index 09ac71d8ae8..a6c024be698 100644
--- a/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb
+++ b/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb
@@ -8,10 +8,11 @@ RSpec.describe 'Merge request > User sees avatars on diff notes', :js do
   include Spec::Support::Helpers::ModalHelpers
   include MergeRequestDiffHelpers
 
-  let(:project)       { create(:project, :public, :repository) }
-  let(:user)          { project.creator }
-  let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user, title: 'Bug NS-04') }
-  let(:path)          { 'files/ruby/popen.rb' }
+  let_it_be(:project) { create(:project, :public, :repository) }
+  let_it_be(:user)    { project.creator }
+  let_it_be(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user, title: 'Bug NS-04') }
+
+  let(:path) { 'files/ruby/popen.rb' }
   let(:position) do
     build(:text_diff_position, :added,
       file: path,
@@ -22,8 +23,11 @@ RSpec.describe 'Merge request > User sees avatars on diff notes', :js do
 
   let!(:note) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: position) }
 
-  before do
+  before_all do
     project.add_maintainer(user)
+  end
+
+  before do
     sign_in user
 
     set_cookie('sidebar_collapsed', 'true')
diff --git a/spec/lib/gitlab/usage/metrics/instrumentations/aggregated_metric_spec.rb b/spec/lib/gitlab/usage/metrics/instrumentations/aggregated_metric_spec.rb
index 71e947df3ef..3e7b13e21c1 100644
--- a/spec/lib/gitlab/usage/metrics/instrumentations/aggregated_metric_spec.rb
+++ b/spec/lib/gitlab/usage/metrics/instrumentations/aggregated_metric_spec.rb
@@ -39,11 +39,12 @@ RSpec.describe Gitlab::Usage::Metrics::Instrumentations::AggregatedMetric, :clea
     'redis_hll' | '28d' | 'OR'  | 3
     'redis_hll' | '7d'  | 'AND' | 1
     'redis_hll' | '7d'  | 'OR'  | 2
-    'database'  | '7d'  | 'OR'  | 3
-    'database'  | '7d'  | 'AND' | 1
+    'database'  | '7d'  | 'OR'  | 3.0
+    'database'  | '7d'  | 'AND' | 1.0
   end
 
   with_them do
+    let(:error_rate) { Gitlab::Database::PostgresHll::BatchDistinctCounter::ERROR_RATE }
     let(:metric_definition) do
       {
         data_source: data_source,
@@ -65,8 +66,7 @@ RSpec.describe Gitlab::Usage::Metrics::Instrumentations::AggregatedMetric, :clea
     end
 
     it 'has correct value' do
-      # database source is providing estimated value that have a lot of decimal places, round it for convenience
-      expect(described_class.new(metric_definition).value.round).to eq(expected_value)
+      expect(described_class.new(metric_definition).value).to be_within(error_rate).percent_of(expected_value)
     end
   end
 end