Skip to content
代码片段 群组 项目
提交 c594659f 编辑于 作者: Robert Speicher's avatar Robert Speicher
浏览文件

Merge branch...

Merge branch '40746-broken-master-due-to-failure-in-spec-services-clusters-applications-schedule_installation_service_spec-rb' into 'master'

Ensure `Namespace`'s is namespaced in `Gitlab::Kubernetes::Helm#initialize` and fix a transient failing spec due to that

Closes #40746

See merge request gitlab-org/gitlab-ce!15684
No related branches found
No related tags found
无相关合并请求
...@@ -18,7 +18,7 @@ def pod_name ...@@ -18,7 +18,7 @@ def pod_name
def initialize(kubeclient) def initialize(kubeclient)
@kubeclient = kubeclient @kubeclient = kubeclient
@namespace = Namespace.new(NAMESPACE, kubeclient) @namespace = Gitlab::Kubernetes::Namespace.new(NAMESPACE, kubeclient)
end end
def install(command) def install(command)
......
...@@ -22,6 +22,8 @@ def count_scheduled ...@@ -22,6 +22,8 @@ def count_scheduled
let(:service) { described_class.new(project, nil, cluster: cluster, application_class: application_class) } let(:service) { described_class.new(project, nil, cluster: cluster, application_class: application_class) }
it 'creates a new application' do it 'creates a new application' do
allow(ClusterInstallAppWorker).to receive(:perform_async)
expect { service.execute }.to change { application_class.count }.by(1) expect { service.execute }.to change { application_class.count }.by(1)
end end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册