diff --git a/doc/development/snowplow/index.md b/doc/development/snowplow/index.md index 0bf4b9356e728cfe7b1d936f86790a92f207dccf..4b6f7595f1097f06a9bc6a2f0ffed83e034626ba 100644 --- a/doc/development/snowplow/index.md +++ b/doc/development/snowplow/index.md @@ -549,13 +549,13 @@ Snowplow Micro is a Docker-based solution for testing frontend and backend event update application_settings set snowplow_collector_hostname='localhost:9090', snowplow_enabled=true, snowplow_cookie_domain='.gitlab.com'; ``` -1. Update `DEFAULT_SNOWPLOW_OPTIONS` in `app/assets/javascripts/tracking.js` to remove `forceSecureTracker: true`: +1. Update `DEFAULT_SNOWPLOW_OPTIONS` in `app/assets/javascripts/tracking/index.js` to remove `forceSecureTracker: true`: ```diff - diff --git a/app/assets/javascripts/tracking.js b/app/assets/javascripts/tracking.js + diff --git a/app/assets/javascripts/tracking/index.js b/app/assets/javascripts/tracking/index.js index 0a1211d0a76..3b98c8f28f2 100644 - --- a/app/assets/javascripts/tracking.js - +++ b/app/assets/javascripts/tracking.js + --- a/app/assets/javascripts/tracking/index.js + +++ b/app/assets/javascripts/tracking/index.js @@ -7,7 +7,6 @@ const DEFAULT_SNOWPLOW_OPTIONS = { appId: '', userFingerprint: false, diff --git a/spec/tooling/danger/project_helper_spec.rb b/spec/tooling/danger/project_helper_spec.rb index 7474709d255b2a1468ae12794480b3a91271af58..5edec1c5229715ff7f8e7e51b6921758125d1040 100644 --- a/spec/tooling/danger/project_helper_spec.rb +++ b/spec/tooling/danger/project_helper_spec.rb @@ -183,7 +183,8 @@ 'lib/generators/rails/usage_metric_definition_generator.rb' | [:backend, :product_intelligence] 'spec/lib/generators/usage_metric_definition_generator_spec.rb' | [:backend, :product_intelligence] 'config/metrics/schema.json' | [:product_intelligence] - 'app/assets/javascripts/tracking.js' | [:frontend, :product_intelligence] + 'app/assets/javascripts/tracking/foo.js' | [:frontend, :product_intelligence] + 'spec/frontend/tracking/foo.js' | [:frontend, :product_intelligence] 'spec/frontend/tracking_spec.js' | [:frontend, :product_intelligence] 'lib/gitlab/usage_database/foo.rb' | [:backend] end diff --git a/tooling/danger/product_intelligence.rb b/tooling/danger/product_intelligence.rb index 0f77f6c6a71ad03d232a8893751d9061d4c9463a..2c005b70de052c4d030c3e7675ba1fa291441288 100644 --- a/tooling/danger/product_intelligence.rb +++ b/tooling/danger/product_intelligence.rb @@ -14,7 +14,10 @@ module ProductIntelligence 'spec/lib/gitlab/tracking_spec.rb', 'app/helpers/tracking_helper.rb', 'spec/helpers/tracking_helper_spec.rb', - 'app/assets/javascripts/tracking.js', + 'app/assets/javascripts/tracking/index.js', + 'app/assets/javascripts/tracking/constants.js', + 'app/assets/javascripts/tracking/get_standard_context.js', + 'spec/frontend/tracking/get_standard_context_spec.js', 'spec/frontend/tracking_spec.js', 'generator_templates/usage_metric_definition/metric_definition.yml', 'lib/generators/gitlab/usage_metric/usage_metric_generator.rb', diff --git a/tooling/danger/project_helper.rb b/tooling/danger/project_helper.rb index a29dc5e5bed4cf25f3c2c342d1f47f492b6bd4b9..2ef0caad5fe99e1a94fa1ae7c1b49acff3bf7a0d 100644 --- a/tooling/danger/project_helper.rb +++ b/tooling/danger/project_helper.rb @@ -43,7 +43,8 @@ module ProjectHelper %r{\Adata/whats_new/} => :docs, %r{\A( - app/assets/javascripts/tracking\.js | + app/assets/javascripts/tracking/.*\.js | + spec/frontend/tracking/.*\.js | spec/frontend/tracking_spec\.js )\z}x => [:frontend, :product_intelligence], %r{\A(ee/)?app/(assets|views)/} => :frontend,