diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-12-21 15:53:19 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-12-21 15:53:19 +0000 |
| commit | c9fdf739b220556124085b554a9a4c04e9c694ab (patch) | |
| tree | 85838dcb2de6c58357765990c472b1b20d13701d /spec | |
| parent | 845e2d3667ed697fea49123c9251226b1f7126ac (diff) | |
| parent | 90c6a1a3198ba8090c645d740ac619e01a2e834e (diff) | |
| download | gitlab-ce-c9fdf739b220556124085b554a9a4c04e9c694ab.tar.gz | |
Merge branch '25908-fix-grape-after-update' into 'master'
Use Grape's new Route methods
See merge request !8223
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/metrics/rack_middleware_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/metrics/rack_middleware_spec.rb b/spec/lib/gitlab/metrics/rack_middleware_spec.rb index bcaffd27909..7371b578a48 100644 --- a/spec/lib/gitlab/metrics/rack_middleware_spec.rb +++ b/spec/lib/gitlab/metrics/rack_middleware_spec.rb @@ -33,7 +33,7 @@ describe Gitlab::Metrics::RackMiddleware do end it 'tags a transaction with the method and path of the route in the grape endpoint' do - route = double(:route, route_method: "GET", route_path: "/:version/projects/:id/archive(.:format)") + route = double(:route, request_method: "GET", path: "/:version/projects/:id/archive(.:format)") endpoint = double(:endpoint, route: route) env['api.endpoint'] = endpoint @@ -117,7 +117,7 @@ describe Gitlab::Metrics::RackMiddleware do let(:transaction) { middleware.transaction_from_env(env) } it 'tags a transaction with the method and path of the route in the grape endpount' do - route = double(:route, route_method: "GET", route_path: "/:version/projects/:id/archive(.:format)") + route = double(:route, request_method: "GET", path: "/:version/projects/:id/archive(.:format)") endpoint = double(:endpoint, route: route) env['api.endpoint'] = endpoint |