diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-25 21:09:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-25 21:09:53 +0300 |
commit | b8817e66c3e17d8981757869fbfab3efc5cc592d (patch) | |
tree | 0f95675261750964d2f90a14a6d0294207f5d8d2 | |
parent | 36b55e94e16da524ce0dbee0558e0b95300f0063 (diff) |
Add latest changes from gitlab-org/gitlab@master
33 files changed, 72 insertions, 64 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 1d12b30c58c..bdd506ab3be 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -88,5 +88,5 @@ = yield :meta_tags = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id') - = render 'layouts/piwik' if extra_config.has_key?('piwik_url') && extra_config.has_key?('piwik_site_id') + = render 'layouts/matomo' if extra_config.has_key?('matomo_url') && extra_config.has_key?('matomo_site_id') = render 'layouts/snowplow' diff --git a/app/views/layouts/_matomo.html.haml b/app/views/layouts/_matomo.html.haml new file mode 100644 index 00000000000..1297d120683 --- /dev/null +++ b/app/views/layouts/_matomo.html.haml @@ -0,0 +1,15 @@ +<!-- Matomo --> += javascript_tag nonce: true do + :plain + var _paq = window._paq = window._paq || []; + _paq.push(['trackPageView']); + _paq.push(['enableLinkTracking']); + (function() { + var u="//#{extra_config.matomo_url}/"; + _paq.push(['setTrackerUrl', u+'matomo.php']); + _paq.push(['setSiteId', "#{extra_config.matomo_site_id}"]); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); + })(); +<noscript><p><img src="//#{extra_config.matomo_url}/matomo.php?idsite=#{extra_config.matomo_site_id}" style="border:0;" alt="" /></p></noscript> +<!-- End Matomo Code --> diff --git a/app/views/layouts/_piwik.html.haml b/app/views/layouts/_piwik.html.haml deleted file mode 100644 index 361a7b03180..00000000000 --- a/app/views/layouts/_piwik.html.haml +++ /dev/null @@ -1,15 +0,0 @@ -<!-- Piwik --> -= javascript_tag nonce: true do - :plain - var _paq = _paq || []; - _paq.push(['trackPageView']); - _paq.push(['enableLinkTracking']); - (function() { - var u="//#{extra_config.piwik_url}/"; - _paq.push(['setTrackerUrl', u+'piwik.php']); - _paq.push(['setSiteId', "#{extra_config.piwik_site_id}"]); - var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; - g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); - })(); -<noscript><p><img src="//#{extra_config.piwik_url}/piwik.php?idsite=#{extra_config.piwik_site_id}" style="border:0;" alt="" /></p></noscript> -<!-- End Piwik Code --> diff --git a/changelogs/unreleased/rename-piwik-matomo.yml b/changelogs/unreleased/rename-piwik-matomo.yml new file mode 100644 index 00000000000..71e5dc2027b --- /dev/null +++ b/changelogs/unreleased/rename-piwik-matomo.yml @@ -0,0 +1,5 @@ +--- +title: Rename Piwik config items and layout file after rebranding to Matomo +merge_request: 45658 +author: Kate Grechishkina @kategrechishkina +type: changed diff --git a/config/feature_flags/development/default_merge_ref_for_diffs.yml b/config/feature_flags/development/default_merge_ref_for_diffs.yml index 8442240e442..1058cff5e8f 100644 --- a/config/feature_flags/development/default_merge_ref_for_diffs.yml +++ b/config/feature_flags/development/default_merge_ref_for_diffs.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34472 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276917 milestone: '13.4' type: development -group: group::source code +group: group::code review default_enabled: false diff --git a/config/feature_flags/development/display_merge_conflicts_in_diff.yml b/config/feature_flags/development/display_merge_conflicts_in_diff.yml index d460e491480..b81b6b25473 100644 --- a/config/feature_flags/development/display_merge_conflicts_in_diff.yml +++ b/config/feature_flags/development/display_merge_conflicts_in_diff.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45008 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/277097 milestone: '13.5' type: development -group: group::source code +group: group::code review default_enabled: false diff --git a/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml b/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml index 6337f6154d9..0eda7b1ca4f 100644 --- a/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml +++ b/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37873 rollout_issue_url: milestone: '13.3' type: development -group: group::source code +group: group::code review default_enabled: true diff --git a/config/feature_flags/development/increased_diff_limits.yml b/config/feature_flags/development/increased_diff_limits.yml index ee811c221dc..898f6597a8a 100644 --- a/config/feature_flags/development/increased_diff_limits.yml +++ b/config/feature_flags/development/increased_diff_limits.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40357 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241185 milestone: '13.5' type: development -group: group::source code +group: group::code review default_enabled: false diff --git a/config/feature_flags/development/merge_ref_auto_sync.yml b/config/feature_flags/development/merge_ref_auto_sync.yml index f22a18940c7..9fd1eecbe5a 100644 --- a/config/feature_flags/development/merge_ref_auto_sync.yml +++ b/config/feature_flags/development/merge_ref_auto_sync.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/29 rollout_issue_url: milestone: '12.1' type: development -group: group::source code +group: group::code review default_enabled: true diff --git a/config/feature_flags/development/merge_ref_auto_sync_lock.yml b/config/feature_flags/development/merge_ref_auto_sync_lock.yml index e26c5ed5050..3aec2b4e062 100644 --- a/config/feature_flags/development/merge_ref_auto_sync_lock.yml +++ b/config/feature_flags/development/merge_ref_auto_sync_lock.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31 rollout_issue_url: milestone: '12.2' type: development -group: group::source code +group: group::code review default_enabled: true diff --git a/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml b/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml index 60db901d801..0cce0bbf3ba 100644 --- a/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml +++ b/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38273 rollout_issue_url: milestone: '13.5' type: development -group: group::source code +group: group::code review default_enabled: false diff --git a/config/feature_flags/development/merge_request_draft_filter.yml b/config/feature_flags/development/merge_request_draft_filter.yml index ee719f52b7c..0614485d37c 100644 --- a/config/feature_flags/development/merge_request_draft_filter.yml +++ b/config/feature_flags/development/merge_request_draft_filter.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35942 rollout_issue_url: milestone: '13.3' type: development -group: group::source code +group: group::code review default_enabled: true diff --git a/config/feature_flags/development/merge_request_reviewers.yml b/config/feature_flags/development/merge_request_reviewers.yml index ca9de4af264..f2f7397c88d 100644 --- a/config/feature_flags/development/merge_request_reviewers.yml +++ b/config/feature_flags/development/merge_request_reviewers.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40488 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/245190 milestone: '13.4' type: development -group: group::source code +group: group::code review default_enabled: false diff --git a/config/feature_flags/development/merge_request_widget_graphql.yml b/config/feature_flags/development/merge_request_widget_graphql.yml index 2969b91039a..ec9748ff5c2 100644 --- a/config/feature_flags/development/merge_request_widget_graphql.yml +++ b/config/feature_flags/development/merge_request_widget_graphql.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38311 rollout_issue_url: milestone: '13.3' type: development -group: group::source code +group: group::code review default_enabled: false diff --git a/config/feature_flags/development/mr_commit_neighbor_nav.yml b/config/feature_flags/development/mr_commit_neighbor_nav.yml index d49dc656858..1605aaa80e4 100644 --- a/config/feature_flags/development/mr_commit_neighbor_nav.yml +++ b/config/feature_flags/development/mr_commit_neighbor_nav.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28596 rollout_issue_url: milestone: '13.0' type: development -group: group::source code +group: group::code review default_enabled: true diff --git a/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml b/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml index c44d14a6dfc..3f2381e9ff6 100644 --- a/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml +++ b/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml @@ -3,5 +3,5 @@ name: mrc_api_use_raw_diffs_from_gitaly introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46190 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/225322 type: development -group: group::source code +group: group::code review default_enabled: false diff --git a/config/feature_flags/development/multiline_comments.yml b/config/feature_flags/development/multiline_comments.yml index dad02bf80fd..ed38e1a575f 100644 --- a/config/feature_flags/development/multiline_comments.yml +++ b/config/feature_flags/development/multiline_comments.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37114 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/211255 milestone: '13.2' type: development -group: group::source code +group: group::code review default_enabled: true diff --git a/config/feature_flags/development/paginated_notes.yml b/config/feature_flags/development/paginated_notes.yml index 67036d693e3..733e23083d2 100644 --- a/config/feature_flags/development/paginated_notes.yml +++ b/config/feature_flags/development/paginated_notes.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34628 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254987 milestone: '13.2' type: development -group: group::source code +group: group::code review default_enabled: false diff --git a/config/feature_flags/development/push_rules_supersede_code_owners.yml b/config/feature_flags/development/push_rules_supersede_code_owners.yml index 7226e443640..504cd7ec38e 100644 --- a/config/feature_flags/development/push_rules_supersede_code_owners.yml +++ b/config/feature_flags/development/push_rules_supersede_code_owners.yml @@ -3,5 +3,5 @@ name: push_rules_supersede_code_owners introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44126 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/262019 type: development -group: group::source code +group: group::code review default_enabled: true diff --git a/config/feature_flags/development/remove_resolve_note.yml b/config/feature_flags/development/remove_resolve_note.yml index f5ec26f7580..0f792dffd0b 100644 --- a/config/feature_flags/development/remove_resolve_note.yml +++ b/config/feature_flags/development/remove_resolve_note.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45549 rollout_issue_url: milestone: '13.6' type: development -group: group::source code +group: group::code review default_enabled: true diff --git a/config/feature_flags/development/squash_options.yml b/config/feature_flags/development/squash_options.yml index 70114cfa252..bea03c6e9b2 100644 --- a/config/feature_flags/development/squash_options.yml +++ b/config/feature_flags/development/squash_options.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33930 rollout_issue_url: milestone: '13.2' type: development -group: group::source code +group: group::code review default_enabled: true diff --git a/config/feature_flags/development/unified_diff_components.yml b/config/feature_flags/development/unified_diff_components.yml index 63470c2a28d..68a1cd8996f 100644 --- a/config/feature_flags/development/unified_diff_components.yml +++ b/config/feature_flags/development/unified_diff_components.yml @@ -3,5 +3,5 @@ name: unified_diff_components introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44974 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268039 type: development -group: group::source code +group: group::code review default_enabled: false diff --git a/config/feature_flags/development/usage_data_i_source_code_code_intelligence.yml b/config/feature_flags/development/usage_data_i_source_code_code_intelligence.yml index 5e4eb0d61af..488053dcf2d 100644 --- a/config/feature_flags/development/usage_data_i_source_code_code_intelligence.yml +++ b/config/feature_flags/development/usage_data_i_source_code_code_intelligence.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41881 rollout_issue_url: milestone: '13.4' type: development -group: group::source code +group: group::code review default_enabled: true diff --git a/config/feature_flags/development/view_diffs_file_by_file.yml b/config/feature_flags/development/view_diffs_file_by_file.yml index 1af945bf30b..f3cfc9f41f3 100644 --- a/config/feature_flags/development/view_diffs_file_by_file.yml +++ b/config/feature_flags/development/view_diffs_file_by_file.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35223 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229848 milestone: '13.2' type: development -group: group::source code +group: group::code review default_enabled: true diff --git a/config/feature_flags/development/widget_visibility_polling.yml b/config/feature_flags/development/widget_visibility_polling.yml index 4cab4a73f8b..3021388b17f 100644 --- a/config/feature_flags/development/widget_visibility_polling.yml +++ b/config/feature_flags/development/widget_visibility_polling.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29318 rollout_issue_url: milestone: '12.10' type: development -group: group::source code +group: group::code review default_enabled: true diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index ae9475aa60d..8822e57e153 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1216,9 +1216,9 @@ production: &base ## Google tag manager # google_tag_manager_id: '_your_tracking_id' - ## Piwik analytics. - # piwik_url: '_your_piwik_url' - # piwik_site_id: '_your_piwik_site_id' + ## Matomo analytics. + # matomo_url: '_your_matomo_url' + # matomo_site_id: '_your_matomo_site_id' rack_attack: git_basic_auth: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 723937c5987..5bac589415a 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -785,6 +785,8 @@ Settings.forti_authenticator['port'] = 443 if Settings.forti_authenticator['port # Extra customization # Settings['extra'] ||= Settingslogic.new({}) +Settings.extra['matomo_site_id'] ||= Settings.extra['piwik_site_id'] +Settings.extra['matomo_url'] ||= Settings.extra['piwik_url'] # # Rack::Attack settings diff --git a/doc/.vale/gitlab/spelling-exceptions.txt b/doc/.vale/gitlab/spelling-exceptions.txt index 90d6d4190e8..27b7ae91e19 100644 --- a/doc/.vale/gitlab/spelling-exceptions.txt +++ b/doc/.vale/gitlab/spelling-exceptions.txt @@ -252,6 +252,7 @@ Markdown markdownlint matcher matchers +Matomo Mattermost mbox memoization diff --git a/doc/administration/job_logs.md b/doc/administration/job_logs.md index 23343d309de..0501962a37e 100644 --- a/doc/administration/job_logs.md +++ b/doc/administration/job_logs.md @@ -30,7 +30,7 @@ it would be `/home/git/gitlab`. ## Changing the job logs local location -To change the location where the job logs will be stored, follow the steps below. +To change the location where the job logs are stored, follow the steps below. **In Omnibus installations:** @@ -117,12 +117,12 @@ you can do so using one of the following options: There isn't a way to automatically expire old job logs, but it's safe to remove them if they're taking up too much space. If you remove the logs manually, the -job output in the UI will be empty. +job output in the UI is empty. For example, to delete all job logs older than 60 days, run the following from a shell in your GitLab instance: DANGER: **Warning:** -This command will permanently delete the log files and is irreversible. +This command permanently deletes the log files and is irreversible. ```shell find /var/opt/gitlab/gitlab-rails/shared/artifacts -name "job.log" -mtime +60 -delete @@ -144,7 +144,7 @@ with one change: _the stored path of the first two phases is different_. This in log architecture stores chunks of logs in Redis and a persistent store (object storage or database) instead of file storage. Redis is used as first-class storage, and it stores up-to 128KB of data. After the full chunk is sent, it is flushed to a persistent store, either object storage (temporary directory) or database. -After a while, the data in Redis and a persistent store will be archived to [object storage](#uploading-logs-to-object-storage). +After a while, the data in Redis and a persistent store is archived to [object storage](#uploading-logs-to-object-storage). The data are stored in the following Redis namespace: `Gitlab::Redis::SharedState`. @@ -185,9 +185,9 @@ Feature.enable(:ci_enable_live_trace) ``` NOTE: **Note:** -The transition period will be handled gracefully. Upcoming logs will be -generated with the incremental architecture, and on-going logs will stay with the -legacy architecture, which means that on-going logs won't be forcibly +The transition period is handled gracefully. Upcoming logs are +generated with the incremental architecture, and on-going logs stay with the +legacy architecture, which means that on-going logs aren't forcibly re-generated with the incremental architecture. **To disable incremental logging (trace):** @@ -197,9 +197,9 @@ Feature.disable('ci_enable_live_trace') ``` NOTE: **Note:** -The transition period will be handled gracefully. Upcoming logs will be generated -with the legacy architecture, and on-going incremental logs will stay with the incremental -architecture, which means that on-going incremental logs won't be forcibly re-generated +The transition period is handled gracefully. Upcoming logs are generated +with the legacy architecture, and on-going incremental logs stay with the incremental +architecture, which means that on-going incremental logs aren't forcibly re-generated with the legacy architecture. ### Potential implications @@ -209,13 +209,13 @@ In some cases, having data stored on Redis could incur data loss: 1. **Case 1: When all data in Redis are accidentally flushed** - On going incremental logs could be recovered by re-sending logs (this is supported by all versions of GitLab Runner). - - Finished jobs which have not archived incremental logs will lose the last part + - Finished jobs which have not archived incremental logs lose the last part (~128KB) of log data. 1. **Case 2: When Sidekiq workers fail to archive (e.g., there was a bug that prevents archiving process, Sidekiq inconsistency, etc.)** - - Currently all log data in Redis will be deleted after one week. If the - Sidekiq workers can't finish by the expiry date, the part of log data will be lost. + - All log data in Redis is deleted after one week. If the + Sidekiq workers can't finish by the expiry date, the part of log data is lost. Another issue that might arise is that it could consume all memory on the Redis instance. If the number of jobs is 1000, 128MB (128KB * 1000) is consumed. diff --git a/doc/development/fe_guide/security.md b/doc/development/fe_guide/security.md index a82c315032f..a78aabd6b88 100644 --- a/doc/development/fe_guide/security.md +++ b/doc/development/fe_guide/security.md @@ -31,7 +31,7 @@ GitLab's CSP is used for the following: Some exceptions include: -- Scripts from Google Analytics and Piwik if either is enabled. +- Scripts from Google Analytics and Matomo if either is enabled. - Connecting with GitHub, Bitbucket, GitLab.com, etc. to allow project importing. - Connecting with Google, Twitter, GitHub, etc. to allow OAuth authentication. @@ -66,7 +66,7 @@ Some resources on implementing Subresource Integrity: ## Including external resources External fonts, CSS, and JavaScript should never be used with the exception of -Google Analytics and Piwik - and only when the instance has enabled it. Assets +Google Analytics and Matomo - and only when the instance has enabled it. Assets should always be hosted and served locally from the GitLab instance. Embedded resources via `iframes` should never be used except in certain circumstances such as with reCAPTCHA, which cannot be used without an `iframe`. diff --git a/doc/user/packages/generic_packages/index.md b/doc/user/packages/generic_packages/index.md index f489c7c800f..102748ba594 100644 --- a/doc/user/packages/generic_packages/index.md +++ b/doc/user/packages/generic_packages/index.md @@ -79,7 +79,7 @@ GET /projects/:id/packages/generic/:package_name/:package_version/:file_name | `package_version` | string | yes | The package version. | | `file_name` | string | yes | The file name. | -The file context is served in the response body. The response content type will be `application/octet-stream`. +The file context is served in the response body. The response content type is `application/octet-stream`. Example request that uses a personal access token: diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md index feb797240f4..8c19448dba4 100644 --- a/doc/user/packages/npm_registry/index.md +++ b/doc/user/packages/npm_registry/index.md @@ -105,7 +105,7 @@ To authenticate to the Package Registry, you must use one of the following: ### Authenticate with a personal access token or deploy token -To authenticate with the Package Registry, you will need a [personal access token](../../profile/personal_access_tokens.md) or [deploy token](../../project/deploy_tokens/index.md). +To authenticate with the Package Registry, you need a [personal access token](../../profile/personal_access_tokens.md) or [deploy token](../../project/deploy_tokens/index.md). #### Project-level NPM endpoint diff --git a/spec/views/layouts/_head.html.haml_spec.rb b/spec/views/layouts/_head.html.haml_spec.rb index 25fcbeb61df..d8748873f64 100644 --- a/spec/views/layouts/_head.html.haml_spec.rb +++ b/spec/views/layouts/_head.html.haml_spec.rb @@ -86,21 +86,21 @@ RSpec.describe 'layouts/_head' do end end - context 'when a Piwik config is set' do - let(:piwik_host) { 'piwik.example.com' } + context 'when a Matomo config is set' do + let(:matomo_host) { 'matomo.example.com' } before do stub_config(extra: { - piwik_url: piwik_host, - piwik_site_id: 12345 + matomo_url: matomo_host, + matomo_site_id: 12345 }) end - it 'add a Piwik Javascript' do + it 'add a Matomo Javascript' do render - expect(rendered).to match(/<script.*>.*var u="\/\/#{piwik_host}\/".*<\/script>/m) - expect(rendered).to match(%r(<noscript>.*<img src="//#{piwik_host}/piwik.php.*</noscript>)) + expect(rendered).to match(/<script.*>.*var u="\/\/#{matomo_host}\/".*<\/script>/m) + expect(rendered).to match(%r(<noscript>.*<img src="//#{matomo_host}/matomo.php.*</noscript>)) end end |