diff options
| author | Mykhailo Formus <mikeformus@gmail.com> | 2018-07-12 09:55:01 +0000 |
|---|---|---|
| committer | Mykhailo Formus <mikeformus@gmail.com> | 2018-07-12 09:55:01 +0000 |
| commit | 7a21f39df92baaa88f9533316e7b19c9c70bd91e (patch) | |
| tree | 090f49a7edc682c31ac29465205c16201bdbe03d /spec/features/projects/clusters | |
| parent | 331f8d71b2c778f10b926114caeb718bce7294d6 (diff) | |
| parent | 767ccaa1725048cd2b27fbf1081cba3ba89d2926 (diff) | |
| download | gitlab-ce-mikeformus/gitlab-ce-qa-264.tar.gz | |
Merge branch 'master' into qa-264mikeformus/gitlab-ce-qa-264
Diffstat (limited to 'spec/features/projects/clusters')
| -rw-r--r-- | spec/features/projects/clusters/applications_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/clusters/gcp_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/clusters/user_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/projects/clusters/applications_spec.rb b/spec/features/projects/clusters/applications_spec.rb index f57647a348f..a65ca662350 100644 --- a/spec/features/projects/clusters/applications_spec.rb +++ b/spec/features/projects/clusters/applications_spec.rb @@ -7,7 +7,7 @@ describe 'Clusters Applications', :js do let(:user) { create(:user) } before do - project.add_master(user) + project.add_maintainer(user) sign_in(user) end diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index bd8cb9b4b94..31e3ebf675d 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -7,7 +7,7 @@ describe 'Gcp Cluster', :js do let(:user) { create(:user) } before do - project.add_master(user) + project.add_maintainer(user) gitlab_sign_in(user) allow(Projects::ClustersController).to receive(:STATUS_POLLING_INTERVAL) { 100 } end diff --git a/spec/features/projects/clusters/user_spec.rb b/spec/features/projects/clusters/user_spec.rb index a49dd72a91f..babf47cc341 100644 --- a/spec/features/projects/clusters/user_spec.rb +++ b/spec/features/projects/clusters/user_spec.rb @@ -7,7 +7,7 @@ describe 'User Cluster', :js do let(:user) { create(:user) } before do - project.add_master(user) + project.add_maintainer(user) gitlab_sign_in(user) allow(Projects::ClustersController).to receive(:STATUS_POLLING_INTERVAL) { 100 } end |