Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f7a565b9
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
f7a565b9
编写于
2月 13, 2018
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Moves mr widget components into vue files
Adds i18n Improves test cases
上级
dd8f56e8
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
86 addition
and
60 deletion
+86
-60
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.js
...request_widget/components/states/mr_widget_not_allowed.js
+0
-19
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue
...equest_widget/components/states/mr_widget_not_allowed.vue
+25
-0
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js
...st_widget/components/states/mr_widget_pipeline_blocked.js
+0
-18
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue
...t_widget/components/states/mr_widget_pipeline_blocked.vue
+24
-0
app/assets/javascripts/vue_merge_request_widget/dependencies.js
...sets/javascripts/vue_merge_request_widget/dependencies.js
+2
-2
spec/javascripts/vue_mr_widget/components/states/mr_widget_not_allowed_spec.js
...mr_widget/components/states/mr_widget_not_allowed_spec.js
+18
-11
spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js
...dget/components/states/mr_widget_pipeline_blocked_spec.js
+17
-10
未找到文件。
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.js
已删除
100644 → 0
浏览文件 @
dd8f56e8
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
export
default
{
name
:
'
MRWidgetNotAllowed
'
,
components
:
{
statusIcon
,
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="success" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
Ready to be merged automatically.
Ask someone with write access to this repository to merge this request
</span>
</div>
</div>
`
,
};
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue
0 → 100644
浏览文件 @
f7a565b9
<
script
>
import
StatusIcon
from
'
../mr_widget_status_icon.vue
'
;
export
default
{
name
:
'
MRWidgetNotAllowed
'
,
components
:
{
StatusIcon
,
},
};
</
script
>
<
template
>
<div
class=
"mr-widget-body media"
>
<status-icon
status=
"success"
:show-disabled-button=
"true"
/>
<div
class=
"media-body space-children"
>
<span
class=
"bold"
>
{{
s__
(
`mrWidget|Ready to be merged automatically.
Ask someone with write access to this repository to merge this request`
)
}}
</span>
</div>
</div>
</
template
>
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js
已删除
100644 → 0
浏览文件 @
dd8f56e8
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
export
default
{
name
:
'
MRWidgetPipelineBlocked
'
,
components
:
{
statusIcon
,
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="warning" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
Pipeline blocked. The pipeline for this merge request requires a manual action to proceed
</span>
</div>
</div>
`
,
};
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue
0 → 100644
浏览文件 @
f7a565b9
<
script
>
import
StatusIcon
from
'
../mr_widget_status_icon.vue
'
;
export
default
{
name
:
'
MRWidgetPipelineBlocked
'
,
components
:
{
StatusIcon
,
},
};
</
script
>
<
template
>
<div
class=
"mr-widget-body media"
>
<status-icon
status=
"warning"
:show-disabled-button=
"true"
/>
<div
class=
"media-body space-children"
>
<span
class=
"bold"
>
{{
s__
(
`mrWidget|Pipeline blocked.
The pipeline for this merge request requires a manual action to proceed`
)
}}
</span>
</div>
</div>
</
template
>
app/assets/javascripts/vue_merge_request_widget/dependencies.js
浏览文件 @
f7a565b9
...
...
@@ -25,11 +25,11 @@ export { default as ArchivedState } from './components/states/mr_widget_archived
export
{
default
as
ConflictsState
}
from
'
./components/states/mr_widget_conflicts.vue
'
;
export
{
default
as
NothingToMergeState
}
from
'
./components/states/mr_widget_nothing_to_merge
'
;
export
{
default
as
MissingBranchState
}
from
'
./components/states/mr_widget_missing_branch.vue
'
;
export
{
default
as
NotAllowedState
}
from
'
./components/states/mr_widget_not_allowed
'
;
export
{
default
as
NotAllowedState
}
from
'
./components/states/mr_widget_not_allowed
.vue
'
;
export
{
default
as
ReadyToMergeState
}
from
'
./components/states/mr_widget_ready_to_merge
'
;
export
{
default
as
SHAMismatchState
}
from
'
./components/states/mr_widget_sha_mismatch
'
;
export
{
default
as
UnresolvedDiscussionsState
}
from
'
./components/states/mr_widget_unresolved_discussions
'
;
export
{
default
as
PipelineBlockedState
}
from
'
./components/states/mr_widget_pipeline_blocked
'
;
export
{
default
as
PipelineBlockedState
}
from
'
./components/states/mr_widget_pipeline_blocked
.vue
'
;
export
{
default
as
PipelineFailedState
}
from
'
./components/states/mr_widget_pipeline_failed
'
;
export
{
default
as
MergeWhenPipelineSucceedsState
}
from
'
./components/states/mr_widget_merge_when_pipeline_succeeds.vue
'
;
export
{
default
as
RebaseState
}
from
'
./components/states/mr_widget_rebase.vue
'
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_not_allowed_spec.js
浏览文件 @
f7a565b9
import
Vue
from
'
vue
'
;
import
notAllowedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_not_allowed
'
;
import
notAllowedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue
'
;
import
mountComponent
from
'
../../../helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetNotAllowed
'
,
()
=>
{
describe
(
'
template
'
,
()
=>
{
let
vm
;
beforeEach
(()
=>
{
const
Component
=
Vue
.
extend
(
notAllowedComponent
);
const
vm
=
new
Component
({
el
:
document
.
createElement
(
'
div
'
),
});
it
(
'
should have correct elements
'
,
()
=>
{
expect
(
vm
.
$el
.
classList
.
contains
(
'
mr-widget-body
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
button
'
).
getAttribute
(
'
disabled
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
innerText
).
toContain
(
'
Ready to be merged automatically.
'
);
expect
(
vm
.
$el
.
innerText
).
toContain
(
'
Ask someone with write access to this repository to merge this request
'
);
});
vm
=
mountComponent
(
Component
);
});
afterEach
(()
=>
{
vm
.
$destroy
();
});
it
(
'
renders success icon
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.ci-status-icon-success
'
)).
not
.
toBe
(
null
);
});
it
(
'
renders informative text
'
,
()
=>
{
expect
(
vm
.
$el
.
innerText
).
toContain
(
'
Ready to be merged automatically.
'
);
expect
(
vm
.
$el
.
innerText
).
toContain
(
'
Ask someone with write access to this repository to merge this request
'
);
});
});
spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js
浏览文件 @
f7a565b9
import
Vue
from
'
vue
'
;
import
pipelineBlockedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked
'
;
import
pipelineBlockedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue
'
;
import
mountComponent
from
'
../../../helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetPipelineBlocked
'
,
()
=>
{
describe
(
'
template
'
,
()
=>
{
let
vm
;
beforeEach
(()
=>
{
const
Component
=
Vue
.
extend
(
pipelineBlockedComponent
);
const
vm
=
new
Component
({
el
:
document
.
createElement
(
'
div
'
),
});
it
(
'
should have correct elements
'
,
()
=>
{
expect
(
vm
.
$el
.
classList
.
contains
(
'
mr-widget-body
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
button
'
).
getAttribute
(
'
disabled
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
innerText
).
toContain
(
'
Pipeline blocked. The pipeline for this merge request requires a manual action to proceed
'
);
});
vm
=
mountComponent
(
Component
);
});
afterEach
(()
=>
{
vm
.
$destroy
();
});
it
(
'
renders warning icon
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.ci-status-icon-warning
'
)).
not
.
toBe
(
null
);
});
it
(
'
renders information text
'
,
()
=>
{
expect
(
vm
.
$el
.
textContent
.
trim
().
replace
(
/
[\r\n]
+/g
,
'
'
)).
toContain
(
'
Pipeline blocked. The pipeline for this merge request requires a manual action to proceed
'
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录