diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 00:08:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 00:08:46 +0000 |
| commit | 6755df108b123ecc8ae330d7c7bf2f04fbf36a81 (patch) | |
| tree | 7609bd6c0a9ac607d8f57737a2c27a460b7fcfdd /spec/lib/gitlab/etag_caching | |
| parent | ee7fba4b844935437233f6c5b74545a28bac4298 (diff) | |
| download | gitlab-ce-6755df108b123ecc8ae330d7c7bf2f04fbf36a81.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/etag_caching')
| -rw-r--r-- | spec/lib/gitlab/etag_caching/router_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/etag_caching/router_spec.rb b/spec/lib/gitlab/etag_caching/router_spec.rb index e25ce4df4aa..4cbabb5ad8d 100644 --- a/spec/lib/gitlab/etag_caching/router_spec.rb +++ b/spec/lib/gitlab/etag_caching/router_spec.rb @@ -68,7 +68,7 @@ describe Gitlab::EtagCaching::Router do it 'matches new merge request pipelines endpoint' do result = described_class.match( - '/my-group/my-project/merge_requests/new.json' + '/my-group/my-project/-/merge_requests/new.json' ) expect(result).to be_present @@ -77,7 +77,7 @@ describe Gitlab::EtagCaching::Router do it 'matches merge request pipelines endpoint' do result = described_class.match( - '/my-group/my-project/merge_requests/234/pipelines.json' + '/my-group/my-project/-/merge_requests/234/pipelines.json' ) expect(result).to be_present |