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
d5c9aaad
Commit
d5c9aaad
authored
May 08, 2018
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use wiki_repo trait on project factory when wiki is used
parent
66123d44
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
ee/spec/elastic_integration/global_search_spec.rb
ee/spec/elastic_integration/global_search_spec.rb
+3
-3
ee/spec/features/search/elastic/global_search_spec.rb
ee/spec/features/search/elastic/global_search_spec.rb
+1
-1
ee/spec/features/search/elastic/group_search_spec.rb
ee/spec/features/search/elastic/group_search_spec.rb
+1
-1
ee/spec/models/concerns/elastic/project_wiki_spec.rb
ee/spec/models/concerns/elastic/project_wiki_spec.rb
+1
-1
ee/spec/requests/api/search_spec.rb
ee/spec/requests/api/search_spec.rb
+1
-1
ee/spec/services/wiki_pages/create_service_spec.rb
ee/spec/services/wiki_pages/create_service_spec.rb
+1
-1
No files found.
ee/spec/elastic_integration/global_search_spec.rb
View file @
d5c9aaad
...
@@ -26,7 +26,7 @@ describe 'GlobalSearch' do
...
@@ -26,7 +26,7 @@ describe 'GlobalSearch' do
context
"Respect feature visibility levels"
do
context
"Respect feature visibility levels"
do
context
"Private projects"
do
context
"Private projects"
do
let
(
:project
)
{
create
(
:project
,
:private
,
:repository
)
}
let
(
:project
)
{
create
(
:project
,
:private
,
:repository
,
:wiki_repo
)
}
# The feature can be disabled but the data may actually exist
# The feature can be disabled but the data may actually exist
it
"does not find items if features are disabled"
do
it
"does not find items if features are disabled"
do
...
@@ -57,7 +57,7 @@ describe 'GlobalSearch' do
...
@@ -57,7 +57,7 @@ describe 'GlobalSearch' do
end
end
context
"Internal projects"
do
context
"Internal projects"
do
let
(
:project
)
{
create
(
:project
,
:internal
,
:repository
)
}
let
(
:project
)
{
create
(
:project
,
:internal
,
:repository
,
:wiki_repo
)
}
# The feature can be disabled but the data may actually exist
# The feature can be disabled but the data may actually exist
it
"does not find items if features are disabled"
do
it
"does not find items if features are disabled"
do
...
@@ -101,7 +101,7 @@ describe 'GlobalSearch' do
...
@@ -101,7 +101,7 @@ describe 'GlobalSearch' do
end
end
context
"Public projects"
do
context
"Public projects"
do
let
(
:project
)
{
create
(
:project
,
:public
,
:repository
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
:repository
,
:wiki_repo
)
}
# The feature can be disabled but the data may actually exist
# The feature can be disabled but the data may actually exist
it
"does not find items if features are disabled"
do
it
"does not find items if features are disabled"
do
...
...
ee/spec/features/search/elastic/global_search_spec.rb
View file @
d5c9aaad
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
feature
'Global elastic search'
do
feature
'Global elastic search'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
namespace:
user
.
namespace
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
:wiki_repo
,
namespace:
user
.
namespace
)
}
before
do
before
do
stub_ee_application_setting
(
elasticsearch_search:
true
,
elasticsearch_indexing:
true
)
stub_ee_application_setting
(
elasticsearch_search:
true
,
elasticsearch_indexing:
true
)
...
...
ee/spec/features/search/elastic/group_search_spec.rb
View file @
d5c9aaad
...
@@ -3,7 +3,7 @@ require 'spec_helper'
...
@@ -3,7 +3,7 @@ require 'spec_helper'
feature
'Group elastic search'
,
:js
do
feature
'Group elastic search'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
namespace:
group
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
:wiki_repo
,
namespace:
group
)
}
def
choose_group
(
group
)
def
choose_group
(
group
)
find
(
'.js-search-group-dropdown'
).
click
find
(
'.js-search-group-dropdown'
).
click
...
...
ee/spec/models/concerns/elastic/project_wiki_spec.rb
View file @
d5c9aaad
...
@@ -6,7 +6,7 @@ describe ProjectWiki, :elastic do
...
@@ -6,7 +6,7 @@ describe ProjectWiki, :elastic do
end
end
it
"searches wiki page"
do
it
"searches wiki page"
do
project
=
create
:project
project
=
create
:project
,
:wiki_repo
Sidekiq
::
Testing
.
inline!
do
Sidekiq
::
Testing
.
inline!
do
project
.
wiki
.
create_page
(
"index_page"
,
"Bla bla term1"
)
project
.
wiki
.
create_page
(
"index_page"
,
"Bla bla term1"
)
...
...
ee/spec/requests/api/search_spec.rb
View file @
d5c9aaad
...
@@ -3,7 +3,7 @@ require 'spec_helper'
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
API
::
Search
do
describe
API
::
Search
do
set
(
:user
)
{
create
(
:user
)
}
set
(
:user
)
{
create
(
:user
)
}
set
(
:group
)
{
create
(
:group
)
}
set
(
:group
)
{
create
(
:group
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
name:
'awesome project'
,
group:
group
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
:wiki_repo
,
name:
'awesome project'
,
group:
group
)
}
let
(
:repo_project
)
{
create
(
:project
,
:public
,
:repository
,
group:
group
)
}
let
(
:repo_project
)
{
create
(
:project
,
:public
,
:repository
,
group:
group
)
}
shared_examples
'response is correct'
do
|
schema
:,
size:
1
|
shared_examples
'response is correct'
do
|
schema
:,
size:
1
|
...
...
ee/spec/services/wiki_pages/create_service_spec.rb
View file @
d5c9aaad
require
'spec_helper'
require
'spec_helper'
describe
WikiPages
::
CreateService
do
describe
WikiPages
::
CreateService
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:wiki_repo
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:opts
)
do
let
(
:opts
)
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