Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
de43719e
Commit
de43719e
authored
May 08, 2018
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use wiki_repo trait on two more project factories
parent
b1c393eb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
ee/spec/features/search/elastic/project_search_spec.rb
ee/spec/features/search/elastic/project_search_spec.rb
+1
-1
ee/spec/lib/gitlab/elastic/search_results_spec.rb
ee/spec/lib/gitlab/elastic/search_results_spec.rb
+7
-7
No files found.
ee/spec/features/search/elastic/project_search_spec.rb
View file @
de43719e
...
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
'Project elastic search'
,
:js
,
:elastic
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
namespace:
user
.
namespace
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
:wiki_repo
,
namespace:
user
.
namespace
)
}
before
do
stub_ee_application_setting
(
elasticsearch_search:
true
,
elasticsearch_indexing:
true
)
...
...
ee/spec/lib/gitlab/elastic/search_results_spec.rb
View file @
de43719e
...
...
@@ -13,8 +13,8 @@ describe Gitlab::Elastic::SearchResults do
end
let
(
:user
)
{
create
(
:user
)
}
let
(
:project_1
)
{
create
(
:project
,
:repository
)
}
let
(
:project_2
)
{
create
(
:project
,
:repository
)
}
let
(
:project_1
)
{
create
(
:project
,
:repository
,
:wiki_repo
)
}
let
(
:project_2
)
{
create
(
:project
,
:repository
,
:wiki_repo
)
}
let
(
:limit_project_ids
)
{
[
project_1
.
id
]
}
describe
'parse_search_result'
do
...
...
@@ -559,7 +559,7 @@ describe Gitlab::Elastic::SearchResults do
end
it
'finds wiki blobs from public projects only'
do
project_2
=
create
:project
,
:repository
,
:private
project_2
=
create
:project
,
:repository
,
:private
,
:wiki_repo
project_2
.
wiki
.
create_page
(
'index_page'
,
'term'
)
project_2
.
wiki
.
index_blobs
Gitlab
::
Elastic
::
Helper
.
refresh_index
...
...
@@ -644,10 +644,10 @@ describe Gitlab::Elastic::SearchResults do
end
describe
'Visibility levels'
do
let
(
:internal_project
)
{
create
(
:project
,
:internal
,
:repository
,
description:
"Internal project"
)
}
let
(
:private_project1
)
{
create
(
:project
,
:private
,
:repository
,
description:
"Private project"
)
}
let
(
:private_project2
)
{
create
(
:project
,
:private
,
:repository
,
description:
"Private project where I'm a member"
)
}
let
(
:public_project
)
{
create
(
:project
,
:public
,
:repository
,
description:
"Public project"
)
}
let
(
:internal_project
)
{
create
(
:project
,
:internal
,
:repository
,
:wiki_repo
,
description:
"Internal project"
)
}
let
(
:private_project1
)
{
create
(
:project
,
:private
,
:repository
,
:wiki_repo
,
description:
"Private project"
)
}
let
(
:private_project2
)
{
create
(
:project
,
:private
,
:repository
,
:wiki_repo
,
description:
"Private project where I'm a member"
)
}
let
(
:public_project
)
{
create
(
:project
,
:public
,
:repository
,
:wiki_repo
,
description:
"Public project"
)
}
let
(
:limit_project_ids
)
{
[
private_project2
.
id
]
}
before
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment