Order and nesting for core usage data specs

Fixes the nesting and brings them in consistency with the ee version
of the usage_data_spec

spec/lib/gitlab/usage_data_spec.rb

@@ -87,82 +87,6 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
         end
       end
 
-      context 'for manage' do
-        it 'includes accurate usage_activity_by_stage data' do
-          stub_config(
-            omniauth:
-              { providers: omniauth_providers }
-          )
-
-          for_defined_days_back do
-            user = create(:user)
-            create(:event, author: user)
-            create(:group_member, user: user)
-          end
-
-          expect(described_class.uncached_data[:usage_activity_by_stage][:manage]).to include(
-            events: 2,
-            groups: 2,
-            users_created: Gitlab.ee? ? 6 : 5,
-            omniauth_providers: ['google_oauth2']
-          )
-          expect(described_class.uncached_data[:usage_activity_by_stage_monthly][:manage]).to include(
-            events: 1,
-            groups: 1,
-            users_created: Gitlab.ee? ? 4 : 3,
-            omniauth_providers: ['google_oauth2']
-          )
-        end
-
-        def omniauth_providers
-          [
-            OpenStruct.new(name: 'google_oauth2'),
-            OpenStruct.new(name: 'ldapmain'),
-            OpenStruct.new(name: 'group_saml')
-          ]
-        end
-      end
-
-      context 'for verify' do
-        it 'includes accurate usage_activity_by_stage data' do
-          for_defined_days_back do
-            user = create(:user)
-            create(:ci_build, user: user)
-            create(:ci_empty_pipeline, source: :external, user: user)
-            create(:ci_empty_pipeline, user: user)
-            create(:ci_pipeline, :auto_devops_source, user: user)
-            create(:ci_pipeline, :repository_source, user: user)
-            create(:ci_pipeline_schedule, owner: user)
-            create(:ci_trigger, owner: user)
-            create(:clusters_applications_runner, :installed)
-          end
-
-          expect(described_class.uncached_data[:usage_activity_by_stage][:verify]).to include(
-            ci_builds: 2,
-            ci_external_pipelines: 2,
-            ci_internal_pipelines: 2,
-            ci_pipeline_config_auto_devops: 2,
-            ci_pipeline_config_repository: 2,
-            ci_pipeline_schedules: 2,
-            ci_pipelines: 2,
-            ci_triggers: 2,
-            clusters_applications_runner: 2
-          )
-          expect(described_class.uncached_data[:usage_activity_by_stage_monthly][:verify]).to include(
-            ci_builds: 1,
-            ci_external_pipelines: 1,
-            ci_internal_pipelines: 1,
-            ci_pipeline_config_auto_devops: 1,
-            ci_pipeline_config_repository: 1,
-            ci_pipeline_schedules: 1,
-            ci_pipelines: 1,
-            ci_triggers: 1,
-            clusters_applications_runner: 1
-          )
-        end
-      end
-    end
-
       context 'for create' do
         it 'include usage_activity_by_stage data' do
           expect(described_class.uncached_data[:usage_activity_by_stage][:create])
@@ -213,6 +137,42 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
         end
       end
 
+      context 'for manage' do
+        it 'includes accurate usage_activity_by_stage data' do
+          stub_config(
+            omniauth:
+              { providers: omniauth_providers }
+          )
+
+          for_defined_days_back do
+            user = create(:user)
+            create(:event, author: user)
+            create(:group_member, user: user)
+          end
+
+          expect(described_class.uncached_data[:usage_activity_by_stage][:manage]).to include(
+            events: 2,
+            groups: 2,
+            users_created: Gitlab.ee? ? 6 : 5,
+            omniauth_providers: ['google_oauth2']
+          )
+          expect(described_class.uncached_data[:usage_activity_by_stage_monthly][:manage]).to include(
+            events: 1,
+            groups: 1,
+            users_created: Gitlab.ee? ? 4 : 3,
+            omniauth_providers: ['google_oauth2']
+          )
+        end
+
+        def omniauth_providers
+          [
+            OpenStruct.new(name: 'google_oauth2'),
+            OpenStruct.new(name: 'ldapmain'),
+            OpenStruct.new(name: 'group_saml')
+          ]
+        end
+      end
+
       context 'for monitor' do
         it 'includes accurate usage_activity_by_stage data' do
           for_defined_days_back do
@@ -284,6 +244,46 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
         end
       end
 
+      context 'for verify' do
+        it 'includes accurate usage_activity_by_stage data' do
+          for_defined_days_back do
+            user = create(:user)
+            create(:ci_build, user: user)
+            create(:ci_empty_pipeline, source: :external, user: user)
+            create(:ci_empty_pipeline, user: user)
+            create(:ci_pipeline, :auto_devops_source, user: user)
+            create(:ci_pipeline, :repository_source, user: user)
+            create(:ci_pipeline_schedule, owner: user)
+            create(:ci_trigger, owner: user)
+            create(:clusters_applications_runner, :installed)
+          end
+
+          expect(described_class.uncached_data[:usage_activity_by_stage][:verify]).to include(
+            ci_builds: 2,
+            ci_external_pipelines: 2,
+            ci_internal_pipelines: 2,
+            ci_pipeline_config_auto_devops: 2,
+            ci_pipeline_config_repository: 2,
+            ci_pipeline_schedules: 2,
+            ci_pipelines: 2,
+            ci_triggers: 2,
+            clusters_applications_runner: 2
+          )
+          expect(described_class.uncached_data[:usage_activity_by_stage_monthly][:verify]).to include(
+            ci_builds: 1,
+            ci_external_pipelines: 1,
+            ci_internal_pipelines: 1,
+            ci_pipeline_config_auto_devops: 1,
+            ci_pipeline_config_repository: 1,
+            ci_pipeline_schedules: 1,
+            ci_pipelines: 1,
+            ci_triggers: 1,
+            clusters_applications_runner: 1
+          )
+        end
+      end
+    end
+
     it 'ensures recorded_at is set before any other usage data calculation' do
       %i(alt_usage_data redis_usage_data distinct_count count).each do |method|
         expect(described_class).not_to receive(method)