diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-23 01:15:28 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-23 01:15:28 +0300 |
| commit | d413e4e465747cc20ccbdb238273793b7b7a6aaa (patch) | |
| tree | dd3aaa7152991aa3f89e1935cc2849c55c9b59bc /spec | |
| parent | 7e37b4e4ef2041f5c1818fdbf7de7fee91608595 (diff) | |
| parent | f78cd68ddf4513716b4f006428693756e04a6729 (diff) | |
Merge branch '58062-tracing-url-template-render-using-string-format-does-not-play-well-with-urls' into 'master'
Switch back to using regexps in tracing_url_template
Closes #58062
See merge request gitlab-org/gitlab-ce!25491
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/tracing_spec.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/spec/lib/gitlab/tracing_spec.rb b/spec/lib/gitlab/tracing_spec.rb index 2cddc895026..566b5050e47 100644 --- a/spec/lib/gitlab/tracing_spec.rb +++ b/spec/lib/gitlab/tracing_spec.rb @@ -44,12 +44,15 @@ describe Gitlab::Tracing do describe '.tracing_url' do where(:tracing_url_enabled?, :tracing_url_template, :correlation_id, :process_name, :tracing_url) do - false | "https://localhost" | "123" | "web" | nil - true | "https://localhost" | "123" | "web" | "https://localhost" - true | "https://localhost?service=%{service}" | "123" | "web" | "https://localhost?service=web" - true | "https://localhost?c=%{correlation_id}" | "123" | "web" | "https://localhost?c=123" - true | "https://localhost?c=%{correlation_id}&s=%{service}" | "123" | "web" | "https://localhost?c=123&s=web" - true | "https://localhost?c=%{correlation_id}" | nil | "web" | "https://localhost?c=" + false | "https://localhost" | "123" | "web" | nil + true | "https://localhost" | "123" | "web" | "https://localhost" + true | "https://localhost?service={{ service }}" | "123" | "web" | "https://localhost?service=web" + true | "https://localhost?c={{ correlation_id }}" | "123" | "web" | "https://localhost?c=123" + true | "https://localhost?c={{ correlation_id }}&s={{ service }}" | "123" | "web" | "https://localhost?c=123&s=web" + true | "https://localhost?c={{ correlation_id }}" | nil | "web" | "https://localhost?c=" + true | "https://localhost?c={{ correlation_id }}&s=%22{{ service }}%22" | "123" | "web" | "https://localhost?c=123&s=%22web%22" + true | "https://localhost?c={{correlation_id}}&s={{service}}" | "123" | "web" | "https://localhost?c=123&s=web" + true | "https://localhost?c={{correlation_id }}&s={{ service}}" | "123" | "web" | "https://localhost?c=123&s=web" end with_them do |