diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-01-05 02:12:04 +0300 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-05 02:12:04 +0300 |
| commit | 178537579f97917b350c035e475760b09754eb7c (patch) | |
| tree | 9a2a4258a8668251ea64f2d63e026d1324dc98d0 /spec/features/projects/clusters | |
| parent | 92a72ce43749226a8dc75f7522d09125a5b4b8cd (diff) | |
| parent | 6f1b4dc76b4619f538b7216ad3a10ca9336d0c2b (diff) | |
Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
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/interchangeability_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/projects/clusters/applications_spec.rb b/spec/features/projects/clusters/applications_spec.rb index b34cd061ec6..9c4abec115f 100644 --- a/spec/features/projects/clusters/applications_spec.rb +++ b/spec/features/projects/clusters/applications_spec.rb @@ -73,7 +73,7 @@ feature 'Clusters Applications', :js do before do allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil) - create(:cluster_applications_helm, :installed, cluster: cluster) + create(:clusters_applications_helm, :installed, cluster: cluster) page.within('.js-cluster-application-row-ingress') do page.find(:css, '.js-cluster-application-install-button').click diff --git a/spec/features/projects/clusters/interchangeability_spec.rb b/spec/features/projects/clusters/interchangeability_spec.rb index 01f9526608f..3ddb35c755c 100644 --- a/spec/features/projects/clusters/interchangeability_spec.rb +++ b/spec/features/projects/clusters/interchangeability_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature 'Interchangeability between KubernetesService and Platform::Kubernetes' do - EXCEPT_METHODS = %i[test title description help fields initialize_properties namespace namespace= api_url api_url=].freeze + EXCEPT_METHODS = %i[test title description help fields initialize_properties namespace namespace= api_url api_url= deprecated? deprecation_message].freeze EXCEPT_METHODS_GREP_V = %w[_touched? _changed? _was].freeze it 'Clusters::Platform::Kubernetes covers core interfaces in KubernetesService' do |