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-24 18:08:50 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-24 18:08:50 +0300
commit4c5468b40825debc2b7bbe08b975dedd2f7f1523 (patch)
treeee64e91b6d014f452e9c9dce6ad9f747a5929108 /spec/views/search
parentd081e00aa79079792b040af3323883f1f43830c5 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views/search')
-rw-r--r--spec/views/search/_filter.html.haml_spec.rb2
-rw-r--r--spec/views/search/_form.html.haml_spec.rb2
-rw-r--r--spec/views/search/_results.html.haml_spec.rb2
-rw-r--r--spec/views/search/show.html.haml_spec.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/spec/views/search/_filter.html.haml_spec.rb b/spec/views/search/_filter.html.haml_spec.rb
index d2cd636f8c6..eb32528e3c7 100644
--- a/spec/views/search/_filter.html.haml_spec.rb
+++ b/spec/views/search/_filter.html.haml_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-describe 'search/_filter' do
+RSpec.describe 'search/_filter' do
context 'when the search page is opened' do
it 'displays the correct elements' do
render
diff --git a/spec/views/search/_form.html.haml_spec.rb b/spec/views/search/_form.html.haml_spec.rb
index 69f40895d86..073a39e4ed6 100644
--- a/spec/views/search/_form.html.haml_spec.rb
+++ b/spec/views/search/_form.html.haml_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-describe 'search/_form' do
+RSpec.describe 'search/_form' do
context 'when the search page is opened' do
it 'displays the correct elements' do
render
diff --git a/spec/views/search/_results.html.haml_spec.rb b/spec/views/search/_results.html.haml_spec.rb
index 3243758c650..cd7a3559538 100644
--- a/spec/views/search/_results.html.haml_spec.rb
+++ b/spec/views/search/_results.html.haml_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-describe 'search/_results' do
+RSpec.describe 'search/_results' do
before do
controller.params[:action] = 'show'
diff --git a/spec/views/search/show.html.haml_spec.rb b/spec/views/search/show.html.haml_spec.rb
index 483b913f2cc..9ddfe08c8f3 100644
--- a/spec/views/search/show.html.haml_spec.rb
+++ b/spec/views/search/show.html.haml_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-describe 'search/show' do
+RSpec.describe 'search/show' do
let(:search_term) { nil }
before do