summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-28 02:01:41 +0900
committerShinya Maeda <shinya@gitlab.com>2017-11-28 20:47:59 +0900
commitb4c4e1bd6ea3c8c12540d50f0bf11e04d72d114b (patch)
treef8c928dfe3243c15029ed460448680099388859e /spec
parent54c70a775af21863d51bd2b3e96e5998c90ddaf7 (diff)
downloadgitlab-ce-b4c4e1bd6ea3c8c12540d50f0bf11e04d72d114b.tar.gz
Fix integraetion tests
Diffstat (limited to 'spec')
-rw-r--r--spec/models/clusters/cluster_spec.rb1
-rw-r--r--spec/views/projects/pipelines_settings/_show.html.haml_spec.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/spec/models/clusters/cluster_spec.rb b/spec/models/clusters/cluster_spec.rb
index b91a5e7a272..7f43e747000 100644
--- a/spec/models/clusters/cluster_spec.rb
+++ b/spec/models/clusters/cluster_spec.rb
@@ -9,7 +9,6 @@ describe Clusters::Cluster do
it { is_expected.to delegate_method(:status_reason).to(:provider) }
it { is_expected.to delegate_method(:status_name).to(:provider) }
it { is_expected.to delegate_method(:on_creation?).to(:provider) }
- it { is_expected.to delegate_method(:update_kubernetes_integration!).to(:platform) }
it { is_expected.to respond_to :project }
describe '.enabled' do
diff --git a/spec/views/projects/pipelines_settings/_show.html.haml_spec.rb b/spec/views/projects/pipelines_settings/_show.html.haml_spec.rb
index c757ccf02d3..95f0be49412 100644
--- a/spec/views/projects/pipelines_settings/_show.html.haml_spec.rb
+++ b/spec/views/projects/pipelines_settings/_show.html.haml_spec.rb
@@ -35,7 +35,7 @@ describe 'projects/pipelines_settings/_show' do
context 'when kubernetes is active' do
before do
- project.build_kubernetes_service(active: true)
+ create(:kubernetes_service, project: project)
end
context 'when auto devops domain is not defined' do