diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-05 15:21:27 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-05 15:21:27 +0100 |
| commit | 36cecc8387932a5caffaf0b911df868815fb8949 (patch) | |
| tree | 58c8d7ce7e8f26913a65de0dff32899e2ab1bbc7 /spec/features/projects/clusters/user_spec.rb | |
| parent | b9419b4da8833a2360170a16f8f72ffbe1b70068 (diff) | |
| parent | c12a4a9ac7c04a215adf6062fec7bf31231c7d4a (diff) | |
| download | gitlab-ce-feature/gb/dangling-builds.tar.gz | |
Merge branch 'master' into feature/gb/dangling-buildsfeature/gb/dangling-builds
* master: (220 commits)
Conflicts:
app/models/ci/build.rb
db/schema.rb
Diffstat (limited to 'spec/features/projects/clusters/user_spec.rb')
| -rw-r--r-- | spec/features/projects/clusters/user_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/projects/clusters/user_spec.rb b/spec/features/projects/clusters/user_spec.rb index 9ae1dba60b5..250c964cc32 100644 --- a/spec/features/projects/clusters/user_spec.rb +++ b/spec/features/projects/clusters/user_spec.rb @@ -9,7 +9,9 @@ describe 'User Cluster', :js do before do project.add_maintainer(user) gitlab_sign_in(user) + allow(Projects::ClustersController).to receive(:STATUS_POLLING_INTERVAL) { 100 } + allow_any_instance_of(Clusters::Gcp::Kubernetes::CreateOrUpdateNamespaceService).to receive(:execute) end context 'when user does not have a cluster and visits cluster index page' do |