Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
7bd66b76
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,发现更多精彩内容 >>
提交
7bd66b76
编写于
9月 13, 2017
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'backstage/gb/optimize-some-specs-with-rspec-set' into 'master'
Optimize some tests with RSpec Set See merge request !14047
上级
1f5ae8cd
6fe19ce9
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
59 addition
and
41 deletion
+59
-41
spec/models/abuse_report_spec.rb
spec/models/abuse_report_spec.rb
+4
-3
spec/models/appearance_spec.rb
spec/models/appearance_spec.rb
+1
-1
spec/models/chat_name_spec.rb
spec/models/chat_name_spec.rb
+2
-1
spec/models/chat_team_spec.rb
spec/models/chat_team_spec.rb
+2
-1
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+27
-21
spec/models/lfs_objects_project_spec.rb
spec/models/lfs_objects_project_spec.rb
+11
-4
spec/requests/api/services_spec.rb
spec/requests/api/services_spec.rb
+7
-6
spec/services/ci/retry_build_service_spec.rb
spec/services/ci/retry_build_service_spec.rb
+5
-4
未找到文件。
spec/models/abuse_report_spec.rb
浏览文件 @
7bd66b76
require
'rails_helper'
RSpec
.
describe
AbuseReport
do
subject
{
create
(
:abuse_report
)
}
let
(
:user
)
{
create
(
:admin
)
}
describe
AbuseReport
do
set
(
:report
)
{
create
(
:abuse_report
)
}
set
(
:user
)
{
create
(
:admin
)
}
subject
{
report
}
it
{
expect
(
subject
).
to
be_valid
}
...
...
spec/models/appearance_spec.rb
浏览文件 @
7bd66b76
require
'rails_helper'
RSpec
.
describe
Appearance
do
describe
Appearance
do
subject
{
build
(
:appearance
)
}
it
{
is_expected
.
to
be_valid
}
...
...
spec/models/chat_name_spec.rb
浏览文件 @
7bd66b76
require
'spec_helper'
describe
ChatName
do
subject
{
create
(
:chat_name
)
}
set
(
:chat_name
)
{
create
(
:chat_name
)
}
subject
{
chat_name
}
it
{
is_expected
.
to
belong_to
(
:service
)
}
it
{
is_expected
.
to
belong_to
(
:user
)
}
...
...
spec/models/chat_team_spec.rb
浏览文件 @
7bd66b76
require
'spec_helper'
describe
ChatTeam
do
subject
{
create
(
:chat_team
)
}
set
(
:chat_team
)
{
create
(
:chat_team
)
}
subject
{
chat_team
}
# Associations
it
{
is_expected
.
to
belong_to
(
:namespace
)
}
...
...
spec/models/ci/build_spec.rb
浏览文件 @
7bd66b76
require
'spec_helper'
describe
Ci
::
Build
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:test_trace
)
{
'This is a test'
}
set
(
:user
)
{
create
(
:user
)
}
set
(
:group
)
{
create
(
:group
,
:access_requestable
)
}
set
(
:project
)
{
create
(
:project
,
:repository
,
group:
group
)
}
l
et
(
:pipeline
)
do
s
et
(
:pipeline
)
do
create
(
:ci_pipeline
,
project:
project
,
sha:
project
.
commit
.
id
,
ref:
project
.
default_branch
,
status:
'success'
)
end
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
it
{
is_expected
.
to
belong_to
(
:runner
)
}
it
{
is_expected
.
to
belong_to
(
:trigger_request
)
}
it
{
is_expected
.
to
belong_to
(
:erased_by
)
}
...
...
@@ -282,7 +283,7 @@ describe Ci::Build do
let
(
:project_regex
)
{
'\(\d+\.\d+\) covered'
}
before
do
project
.
build_coverage_regex
=
project_regex
project
.
update_column
(
:build_coverage_regex
,
project_regex
)
end
context
'and coverage_regex attribute is not set'
do
...
...
@@ -1096,9 +1097,6 @@ describe Ci::Build do
end
describe
'#repo_url'
do
let
(
:build
)
{
create
(
:ci_build
)
}
let
(
:project
)
{
build
.
project
}
subject
{
build
.
repo_url
}
it
{
is_expected
.
to
be_a
(
String
)
}
...
...
@@ -1199,6 +1197,8 @@ describe Ci::Build do
end
context
'use from gitlab-ci.yml'
do
let
(
:pipeline
)
{
create
(
:ci_pipeline
)
}
before
do
stub_ci_pipeline_yaml_file
(
config
)
end
...
...
@@ -1442,11 +1442,7 @@ describe Ci::Build do
{
key:
'SECRET_KEY'
,
value:
'secret_value'
,
public:
false
}
end
let
(
:group
)
{
create
(
:group
,
:access_requestable
)
}
before
do
build
.
project
.
update
(
group:
group
)
create
(
:ci_group_variable
,
secret_variable
.
slice
(
:key
,
:value
).
merge
(
group:
group
))
end
...
...
@@ -1459,11 +1455,7 @@ describe Ci::Build do
{
key:
'PROTECTED_KEY'
,
value:
'protected_value'
,
public:
false
}
end
let
(
:group
)
{
create
(
:group
,
:access_requestable
)
}
before
do
build
.
project
.
update
(
group:
group
)
create
(
:ci_group_variable
,
:protected
,
protected_variable
.
slice
(
:key
,
:value
).
merge
(
group:
group
))
...
...
@@ -1486,6 +1478,10 @@ describe Ci::Build do
end
context
'when the ref is not protected'
do
before
do
build
.
update_column
(
:ref
,
'some/feature'
)
end
it
{
is_expected
.
not_to
include
(
protected_variable
)
}
end
end
...
...
@@ -1552,6 +1548,8 @@ describe Ci::Build do
end
context
'when yaml_variables are undefined'
do
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
before
do
build
.
yaml_variables
=
nil
end
...
...
@@ -1645,7 +1643,10 @@ describe Ci::Build do
before
do
build
.
environment
=
'production'
allow
(
project
).
to
receive
(
:deployment_variables
).
and_return
([
deployment_variable
])
allow_any_instance_of
(
Project
)
.
to
receive
(
:deployment_variables
)
.
and_return
([
deployment_variable
])
end
it
{
is_expected
.
to
include
(
deployment_variable
)
}
...
...
@@ -1669,14 +1670,19 @@ describe Ci::Build do
before
do
allow
(
build
).
to
receive
(
:predefined_variables
)
{
[
build_pre_var
]
}
allow
(
project
).
to
receive
(
:predefined_variables
)
{
[
project_pre_var
]
}
allow
(
pipeline
).
to
receive
(
:predefined_variables
)
{
[
pipeline_pre_var
]
}
allow
(
build
).
to
receive
(
:yaml_variables
)
{
[
build_yaml_var
]
}
allow
(
project
).
to
receive
(
:secret_variables_for
)
allow_any_instance_of
(
Project
)
.
to
receive
(
:predefined_variables
)
{
[
project_pre_var
]
}
allow_any_instance_of
(
Project
)
.
to
receive
(
:secret_variables_for
)
.
with
(
ref:
'master'
,
environment:
nil
)
do
[
create
(
:ci_variable
,
key:
'secret'
,
value:
'value'
)]
end
allow_any_instance_of
(
Ci
::
Pipeline
)
.
to
receive
(
:predefined_variables
)
{
[
pipeline_pre_var
]
}
end
it
do
...
...
spec/models/lfs_objects_project_spec.rb
浏览文件 @
7bd66b76
require
'spec_helper'
describe
LfsObjectsProject
do
subject
{
create
(
:lfs_objects_project
,
project:
project
)
}
let
(
:project
)
{
create
(
:project
)
}
set
(
:project
)
{
create
(
:project
)
}
subject
do
create
(
:lfs_objects_project
,
project:
project
)
end
describe
'associations'
do
it
{
is_expected
.
to
belong_to
(
:project
)
}
...
...
@@ -11,9 +14,13 @@ describe LfsObjectsProject do
describe
'validation'
do
it
{
is_expected
.
to
validate_presence_of
(
:lfs_object_id
)
}
it
{
is_expected
.
to
validate_uniqueness_of
(
:lfs_object_id
).
scoped_to
(
:project_id
).
with_message
(
"already exists in project"
)
}
it
{
is_expected
.
to
validate_presence_of
(
:project_id
)
}
it
'validates object id'
do
is_expected
.
to
validate_uniqueness_of
(
:lfs_object_id
)
.
scoped_to
(
:project_id
)
.
with_message
(
"already exists in project"
)
end
end
describe
'#update_project_statistics'
do
...
...
spec/requests/api/services_spec.rb
浏览文件 @
7bd66b76
require
"spec_helper"
describe
API
::
Services
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:admin
)
{
create
(
:admin
)
}
let
(
:user2
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
creator_id:
user
.
id
,
namespace:
user
.
namespace
)
}
set
(
:user
)
{
create
(
:user
)
}
set
(
:admin
)
{
create
(
:admin
)
}
set
(
:user2
)
{
create
(
:user
)
}
set
(
:project
)
do
create
(
:project
,
creator_id:
user
.
id
,
namespace:
user
.
namespace
)
end
Service
.
available_services_names
.
each
do
|
service
|
describe
"PUT /projects/:id/services/
#{
service
.
dasherize
}
"
do
...
...
@@ -98,8 +101,6 @@ describe API::Services do
end
describe
'POST /projects/:id/services/:slug/trigger'
do
let!
(
:project
)
{
create
(
:project
)
}
describe
'Mattermost Service'
do
let
(
:service_name
)
{
'mattermost_slash_commands'
}
...
...
spec/services/ci/retry_build_service_spec.rb
浏览文件 @
7bd66b76
require
'spec_helper'
describe
Ci
::
RetryBuildService
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
set
(
:user
)
{
create
(
:user
)
}
set
(
:project
)
{
create
(
:project
)
}
set
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:service
)
do
...
...
@@ -37,7 +38,7 @@ describe Ci::RetryBuildService do
:queued
,
:coverage
,
:tags
,
:allowed_to_fail
,
:on_tag
,
:triggered
,
:trace
,
:teardown_environment
,
description:
'my-job'
,
stage:
'test'
,
pipeline:
pipeline
,
auto_canceled_by:
create
(
:ci_empty_pipeline
))
do
|
build
|
auto_canceled_by:
create
(
:ci_empty_pipeline
,
project:
project
))
do
|
build
|
##
# TODO, workaround for FactoryGirl limitation when having both
# stage (text) and stage_id (integer) columns in the table.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录