diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-05 13:28:54 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-05 13:28:54 +0000 |
commit | 63c0a702159068576ab93d98a13b7b14dd63104b (patch) | |
tree | cafa4f0999f9ec56c332e053ed8e9e7311003f88 /spec | |
parent | 4dd53240fb760af16e43f4ee6a3ff12dc296d7e0 (diff) | |
parent | f1dce2160956f27fecc4a59d36d1e1e03903a84b (diff) | |
download | gitlab-ce-63c0a702159068576ab93d98a13b7b14dd63104b.tar.gz |
Merge branch 'allow-ref-name-caching-projects-controller' into 'master'
Enable FindCommit caching for project and commits pages
See merge request gitlab-org/gitlab-ce!27048
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/projects/commits_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/controllers/projects_controller_spec.rb | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/spec/controllers/projects/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb index 9fb455dd974..9f753e5641f 100644 --- a/spec/controllers/projects/commits_controller_spec.rb +++ b/spec/controllers/projects/commits_controller_spec.rb @@ -113,6 +113,8 @@ describe Projects::CommitsController do render_views before do + expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original unless id.include?(' ') + get(:signatures, params: { namespace_id: project.namespace, diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index 04cc315b175..1ce06bc877c 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -78,6 +78,10 @@ describe ProjectsController do end context "user has access to project" do + before do + expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original + end + context "and does not have notification setting" do it "initializes notification as disabled" do get :show, params: { namespace_id: public_project.namespace, id: public_project } |