Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-16 21:09:01 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-16 21:09:01 +0300
commit4f5c8572e988e8c0c6871fb59ccfbfd39b9c2a06 (patch)
tree5a88f2b76e947bce06488dc6c091fbd970ee73ea /spec/features/clusters
parent10fd79745df7b572fc79fd84b58e818e64bf2571 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/clusters')
-rw-r--r--spec/features/clusters/cluster_detail_page_spec.rb2
-rw-r--r--spec/features/clusters/installing_applications_shared_examples.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/clusters/cluster_detail_page_spec.rb b/spec/features/clusters/cluster_detail_page_spec.rb
index 4b478163952..6058c35c2cf 100644
--- a/spec/features/clusters/cluster_detail_page_spec.rb
+++ b/spec/features/clusters/cluster_detail_page_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-describe 'Clusterable > Show page' do
+RSpec.describe 'Clusterable > Show page' do
include KubernetesHelpers
let(:current_user) { create(:user) }
diff --git a/spec/features/clusters/installing_applications_shared_examples.rb b/spec/features/clusters/installing_applications_shared_examples.rb
index 5b565c0a304..d2f28f5b219 100644
--- a/spec/features/clusters/installing_applications_shared_examples.rb
+++ b/spec/features/clusters/installing_applications_shared_examples.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-shared_examples "installing applications for a cluster" do |managed_apps_local_tiller|
+RSpec.shared_examples "installing applications for a cluster" do |managed_apps_local_tiller|
before do
stub_feature_flags(managed_apps_local_tiller: managed_apps_local_tiller)
@@ -279,7 +279,7 @@ shared_examples "installing applications for a cluster" do |managed_apps_local_t
end
end
-shared_examples "installing applications on a cluster" do
+RSpec.shared_examples "installing applications on a cluster" do
it_behaves_like "installing applications for a cluster", false
it_behaves_like "installing applications for a cluster", true
end