summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-05-23 17:48:51 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-05-23 17:48:51 +0000
commit536f74ff1e9a2b7e5723cf5d866e7cb9d650a877 (patch)
treeab2af715fe1137fe272fd8ba83f61de300cbd36f /spec/lib
parentd07e85e1033f8026f155c6171cb3ebcd6b93d9ed (diff)
parentb518cd867f731298762f51ef15375c00f11c441d (diff)
downloadgitlab-ce-536f74ff1e9a2b7e5723cf5d866e7cb9d650a877.tar.gz
Merge branch 'zj-fix-pipeline-etag' into 'master'
Fix pipeline etag Closes #32658 See merge request !11615
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/etag_caching/router_spec.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/spec/lib/gitlab/etag_caching/router_spec.rb b/spec/lib/gitlab/etag_caching/router_spec.rb
index 5ae4a19263c..46a238b17f4 100644
--- a/spec/lib/gitlab/etag_caching/router_spec.rb
+++ b/spec/lib/gitlab/etag_caching/router_spec.rb
@@ -77,6 +77,17 @@ describe Gitlab::EtagCaching::Router do
expect(result).to be_blank
end
+ it 'matches pipeline#show endpoint' do
+ env = build_env(
+ '/my-group/my-project/pipelines/2.json'
+ )
+
+ result = described_class.match(env)
+
+ expect(result).to be_present
+ expect(result.name).to eq 'project_pipeline'
+ end
+
def build_env(path)
{ 'PATH_INFO' => path }
end