Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3ccdc02b
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3ccdc02b
编写于
5月 04, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
上级
c874422b
16db51ec
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
34 addition
and
0 deletion
+34
-0
CHANGELOG
CHANGELOG
+1
-0
app/helpers/wiki_helper.rb
app/helpers/wiki_helper.rb
+2
-0
features/search.feature
features/search.feature
+6
-0
features/steps/project/wiki.rb
features/steps/project/wiki.rb
+5
-0
features/steps/search.rb
features/steps/search.rb
+20
-0
未找到文件。
CHANGELOG
浏览文件 @
3ccdc02b
...
...
@@ -6,6 +6,7 @@ v 7.11.0 (unreleased)
- Don't allow a merge request to be merged when its title starts with "WIP".
- Add a page title to every page.
- Allow primary email to be set to an email that you've already added.
- Fix Error 500 when searching Wiki pages (Stan Hu)
- Get Gitorious importer to work again.
- Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
- Ignore invalid lines in .gitmodules
...
...
app/helpers/wiki_helper.rb
浏览文件 @
3ccdc02b
...
...
@@ -6,6 +6,8 @@ module WikiHelper
case
wiki_page
when
Symbol
wiki_page
when
String
wiki_page
else
wiki_page
.
slug
end
...
...
features/search.feature
浏览文件 @
3ccdc02b
...
...
@@ -44,3 +44,9 @@ Feature: Search
Then
I should see
"Foo"
link in the search results
And
I should not see
"Bar"
link in the search results
Scenario
:
I
should see Wiki blobs
And
project has Wiki content
When
I click project
"Shop"
link
And
I search for
"Wiki content"
And
I click
"Wiki"
link
Then
I should see
"test_wiki"
link in the search results
features/steps/project/wiki.rb
浏览文件 @
3ccdc02b
...
...
@@ -159,6 +159,11 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
page
.
should
have_content
(
'History for'
)
end
step
'I search for Wiki content'
do
fill_in
"Search in this project"
,
with:
"wiki_content"
click_button
"Search"
end
def
wiki
@project_wiki
=
ProjectWiki
.
new
(
project
,
current_user
)
end
...
...
features/steps/search.rb
浏览文件 @
3ccdc02b
...
...
@@ -18,6 +18,11 @@ class Spinach::Features::Search < Spinach::FeatureSteps
click_button
"Search"
end
step
'I search for "Wiki content"'
do
fill_in
"dashboard_search"
,
with:
"content"
click_button
"Search"
end
step
'I click "Issues" link'
do
within
'.search-filter'
do
click_link
'Issues'
...
...
@@ -36,6 +41,12 @@ class Spinach::Features::Search < Spinach::FeatureSteps
end
end
step
'I click "Wiki" link'
do
within
'.search-filter'
do
click_link
'Wiki'
end
end
step
'I should see "Shop" project link'
do
page
.
should
have_link
"Shop"
end
...
...
@@ -66,4 +77,13 @@ class Spinach::Features::Search < Spinach::FeatureSteps
step
'I should not see "Bar" link in the search results'
do
find
(
:css
,
'.search-results'
).
should_not
have_link
'Bar'
end
step
'I should see "test_wiki" link in the search results'
do
find
(
:css
,
'.search-results'
).
should
have_link
'test_wiki.md'
end
step
'project has Wiki content'
do
@wiki
=
::
ProjectWiki
.
new
(
project
,
current_user
)
@wiki
.
create_page
(
"test_wiki"
,
"Some Wiki content"
,
:markdown
,
"first commit"
)
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录