Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
972440b1
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,发现更多精彩内容 >>
提交
972440b1
编写于
4月 25, 2017
作者:
T
Tiago Botelho
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tadds migration to remove invalid services
上级
67974f1d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
47 addition
and
25 deletion
+47
-25
db/migrate/20170421102337_remove_nil_type_services.rb
db/migrate/20170421102337_remove_nil_type_services.rb
+12
-0
spec/factories/services.rb
spec/factories/services.rb
+13
-0
spec/lib/gitlab/import_export/project.json
spec/lib/gitlab/import_export/project.json
+19
-22
spec/lib/gitlab/import_export/relation_factory_spec.rb
spec/lib/gitlab/import_export/relation_factory_spec.rb
+1
-1
spec/models/project_services/issue_tracker_service_spec.rb
spec/models/project_services/issue_tracker_service_spec.rb
+1
-1
spec/models/service_spec.rb
spec/models/service_spec.rb
+1
-1
未找到文件。
db/migrate/20170421102337_remove_nil_type_services.rb
0 → 100644
浏览文件 @
972440b1
class
RemoveNilTypeServices
<
ActiveRecord
::
Migration
DOWNTIME
=
false
def
up
execute
<<-
SQL
DELETE FROM services WHERE type IS NULL OR type = '';
SQL
end
def
down
end
end
spec/factories/services.rb
浏览文件 @
972440b1
FactoryGirl
.
define
do
factory
:service
do
project
factory: :empty_project
type
'Service'
end
factory
:custom_issue_tracker_service
,
class:
CustomIssueTrackerService
do
project
factory: :empty_project
type
'CustomIssueTrackerService'
category
'issue_tracker'
active
true
properties
(
project_url:
'https://project.url.com'
,
issues_url:
'https://issues.url.com'
,
new_issue_url:
'https://newissue.url.com'
)
end
factory
:kubernetes_service
do
...
...
spec/lib/gitlab/import_export/project.json
浏览文件 @
972440b1
...
...
@@ -6980,28 +6980,6 @@
],
"services"
:
[
{
"id"
:
164
,
"title"
:
null
,
"project_id"
:
5
,
"created_at"
:
"2016-06-14T15:02:07.372Z"
,
"updated_at"
:
"2016-06-14T15:02:07.372Z"
,
"active"
:
false
,
"properties"
:
{
},
"template"
:
false
,
"push_events"
:
true
,
"issues_events"
:
true
,
"merge_requests_events"
:
true
,
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"category"
:
"issue_tracker"
,
"type"
:
"CustomIssueTrackerService"
,
"default"
:
true
,
"wiki_page_events"
:
true
},
{
"id"
:
100
,
"title"
:
"JetBrains TeamCity CI"
,
...
...
@@ -7019,6 +6997,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"TeamcityService"
,
"category"
:
"ci"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7040,6 +7019,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"pipeline_events"
:
true
,
"type"
:
"SlackService"
,
"category"
:
"common"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7061,6 +7041,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"RedmineService"
,
"category"
:
"issue_tracker"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7082,6 +7063,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"PushoverService"
,
"category"
:
"common"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7103,6 +7085,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"PivotalTrackerService"
,
"category"
:
"common"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7125,6 +7108,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"JiraService"
,
"category"
:
"issue_tracker"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7146,6 +7130,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"IrkerService"
,
"category"
:
"common"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7167,6 +7152,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"pipeline_events"
:
true
,
"type"
:
"HipchatService"
,
"category"
:
"common"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7188,6 +7174,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"GemnasiumService"
,
"category"
:
"common"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7209,6 +7196,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"FlowdockService"
,
"category"
:
"common"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7230,6 +7218,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"ExternalWikiService"
,
"category"
:
"common"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7251,6 +7240,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"EmailsOnPushService"
,
"category"
:
"common"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7272,6 +7262,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"DroneCiService"
,
"category"
:
"ci"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7293,6 +7284,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"CustomIssueTrackerService"
,
"category"
:
"issue_tracker"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7314,6 +7306,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"CampfireService"
,
"category"
:
"common"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7335,6 +7328,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"BuildkiteService"
,
"category"
:
"ci"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7356,6 +7350,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"BambooService"
,
"category"
:
"ci"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7377,6 +7372,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"AssemblaService"
,
"category"
:
"common"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
@@ -7398,6 +7394,7 @@
"tag_push_events"
:
true
,
"note_events"
:
true
,
"build_events"
:
true
,
"type"
:
"AssemblaService"
,
"category"
:
"common"
,
"default"
:
false
,
"wiki_page_events"
:
true
...
...
spec/lib/gitlab/import_export/relation_factory_spec.rb
浏览文件 @
972440b1
...
...
@@ -60,7 +60,7 @@ describe Gitlab::ImportExport::RelationFactory, lib: true do
end
context
'original service exists'
do
let
(
:service_id
)
{
Service
.
create
(
project:
project
).
id
}
let
(
:service_id
)
{
create
(
:service
,
project:
project
).
id
}
it
'does not have the original service_id'
do
expect
(
created_object
.
service_id
).
not_to
eq
(
service_id
)
...
...
spec/models/project_services/issue_tracker_service_spec.rb
浏览文件 @
972440b1
...
...
@@ -8,7 +8,7 @@ describe IssueTrackerService, models: true do
let
(
:service
)
{
RedmineService
.
new
(
project:
project
,
active:
true
)
}
before
do
create
(
:
service
,
project:
project
,
active:
true
,
category:
'issue_tracker'
)
create
(
:
custom_issue_tracker_service
,
project:
project
)
end
context
'when service is changed manually by user'
do
...
...
spec/models/service_spec.rb
浏览文件 @
972440b1
...
...
@@ -7,7 +7,7 @@ describe Service, models: true do
end
describe
'Validations'
do
it
{
is_expected
.
to
validate_presence_of
(
:type
)
.
on
(
:create
)
}
it
{
is_expected
.
to
validate_presence_of
(
:type
)
}
end
describe
"Test Button"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录