Add latest changes from gitlab-org/gitlab@master

3 files changed, 12 insertions, 12 deletions

diff --git a/spec/graphql/types/admin/analytics/instance_statistics/measurement_identifier_enum_spec.rb b/spec/graphql/types/admin/analytics/usage_trends/measurement_identifier_enum_spec.rb
index 8a7408224a2..91851c11dc8 100644
--- a/spec/graphql/types/admin/analytics/instance_statistics/measurement_identifier_enum_spec.rb
+++ b/spec/graphql/types/admin/analytics/usage_trends/measurement_identifier_enum_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe GitlabSchema.types['MeasurementIdentifier'] do
 
   it 'exposes all the existing identifier values' do
     ee_only_identifiers = %w[billable_users]
-    identifiers = Analytics::InstanceStatistics::Measurement.identifiers.keys.reject do |x|
+    identifiers = Analytics::UsageTrends::Measurement.identifiers.keys.reject do |x|
       ee_only_identifiers.include?(x)
     end.map(&:upcase)
 
diff --git a/spec/graphql/types/admin/analytics/instance_statistics/measurement_type_spec.rb b/spec/graphql/types/admin/analytics/usage_trends/measurement_type_spec.rb
index ffb1a0f30c9..c50092d7f0e 100644
--- a/spec/graphql/types/admin/analytics/instance_statistics/measurement_type_spec.rb
+++ b/spec/graphql/types/admin/analytics/usage_trends/measurement_type_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe GitlabSchema.types['InstanceStatisticsMeasurement'] do
+RSpec.describe GitlabSchema.types['UsageTrendsMeasurement'] do
   subject { described_class }
 
   it { is_expected.to have_graphql_field(:recorded_at) }
@@ -10,13 +10,13 @@ RSpec.describe GitlabSchema.types['InstanceStatisticsMeasurement'] do
   it { is_expected.to have_graphql_field(:count) }
 
   describe 'authorization' do
-    let_it_be(:measurement) { create(:instance_statistics_measurement, :project_count) }
+    let_it_be(:measurement) { create(:usage_trends_measurement, :project_count) }
     let(:user) { create(:user) }
 
     let(:query) do
       <<~GRAPHQL
-        query instanceStatisticsMeasurements($identifier: MeasurementIdentifier!) {
-          instanceStatisticsMeasurements(identifier: $identifier) {
+        query usageTrendsMeasurements($identifier: MeasurementIdentifier!) {
+          usageTrendsMeasurements(identifier: $identifier) {
             nodes {
               count
               identifier
@@ -36,7 +36,7 @@ RSpec.describe GitlabSchema.types['InstanceStatisticsMeasurement'] do
 
     context 'when the user is not admin' do
       it 'returns no data' do
-        expect(subject.dig('data', 'instanceStatisticsMeasurements')).to be_nil
+        expect(subject.dig('data', 'usageTrendsMeasurements')).to be_nil
       end
     end
 
@@ -48,7 +48,7 @@ RSpec.describe GitlabSchema.types['InstanceStatisticsMeasurement'] do
       end
 
       it 'returns data' do
-        expect(subject.dig('data', 'instanceStatisticsMeasurements', 'nodes')).not_to be_empty
+        expect(subject.dig('data', 'usageTrendsMeasurements', 'nodes')).not_to be_empty
       end
     end
   end
diff --git a/spec/graphql/types/query_type_spec.rb b/spec/graphql/types/query_type_spec.rb
index fea0a3bd37e..cb8e875dbf4 100644
--- a/spec/graphql/types/query_type_spec.rb
+++ b/spec/graphql/types/query_type_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe GitlabSchema.types['Query'] do
       user
       users
       issue
-      instance_statistics_measurements
+      usage_trends_measurements
       runner_platforms
     ]
 
@@ -65,11 +65,11 @@ RSpec.describe GitlabSchema.types['Query'] do
     end
   end
 
-  describe 'instance_statistics_measurements field' do
-    subject { described_class.fields['instanceStatisticsMeasurements'] }
+  describe 'usage_trends_measurements field' do
+    subject { described_class.fields['usageTrendsMeasurements'] }
 
-    it 'returns instance statistics measurements' do
-      is_expected.to have_graphql_type(Types::Admin::Analytics::InstanceStatistics::MeasurementType.connection_type)
+    it 'returns usage trends measurements' do
+      is_expected.to have_graphql_type(Types::Admin::Analytics::UsageTrends::MeasurementType.connection_type)
     end
   end