Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
Container registry
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
21b5b38f
提交
21b5b38f
编辑于
3 years ago
作者:
Sanad Liaquat
浏览文件
操作
下载
差异文件
Merge branch 'tomi/test/remove_fleature_flag_test' into 'master'
Removing test for ref diff See merge request gitlab-org/gitlab!77945
上级
f6ac0382
6567993e
No related branches found
分支 包含提交
No related tags found
标签 包含提交
无相关合并请求
变更
1
隐藏空白变更内容
行内
左右并排
显示
1 个更改的文件
qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_merge_ref_diff_spec.rb
+0
-90
0 个添加, 90 个删除
...e/merge_request/view_merge_request_merge_ref_diff_spec.rb
有
0 个添加
和
90 个删除
qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_merge_ref_diff_spec.rb
已删除
100644 → 0
+
0
−
90
浏览文件 @
f6ac0382
# frozen_string_literal: true
module
QA
RSpec
.
describe
'Create'
,
:requires_admin
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/261793'
,
type: :investigating
}
do
describe
'View merge request merge-ref diff'
do
let
(
:project
)
do
Resource
::
Project
.
fabricate_via_api!
do
|
project
|
project
.
name
=
'merge-ref-diff'
end
end
let
(
:merge_request
)
do
Resource
::
MergeRequest
.
fabricate_via_api!
do
|
merge_request
|
merge_request
.
project
=
project
merge_request
.
title
=
'This is a merge request'
merge_request
.
description
=
'... for viewing merge-ref and merge-base diffs'
merge_request
.
file_content
=
'This exists on the source branch only'
end
end
let
(
:new_file_name
)
{
"added_file-
#{
SecureRandom
.
hex
(
8
)
}
.txt"
}
context
'when the feature flag default_merge_ref_for_diffs is enabled'
do
before
do
Runtime
::
Feature
.
enable
(
'default_merge_ref_for_diffs'
,
project:
project
)
commit_to_branch
(
merge_request
.
target_branch
,
new_file_name
)
commit_to_branch
(
merge_request
.
source_branch
,
new_file_name
)
Flow
::
Login
.
sign_in
merge_request
.
visit!
end
it
'views the merge-ref diff by default'
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347651'
do
Page
::
MergeRequest
::
Show
.
perform
do
|
mr_page
|
mr_page
.
click_diffs_tab
mr_page
.
click_target_version_dropdown
expect
(
mr_page
.
version_dropdown_content
).
to
include
(
"
#{
project
.
default_branch
}
(HEAD)"
)
expect
(
mr_page
.
version_dropdown_content
).
not_to
include
(
"
#{
project
.
default_branch
}
(base)"
)
expect
(
mr_page
).
to
have_file
(
merge_request
.
file_name
)
expect
(
mr_page
).
not_to
have_file
(
new_file_name
)
end
end
end
context
'when the feature flag default_merge_ref_for_diffs is disabled'
do
before
do
Runtime
::
Feature
.
disable
(
'default_merge_ref_for_diffs'
,
project:
project
)
commit_to_branch
(
merge_request
.
target_branch
,
new_file_name
)
commit_to_branch
(
merge_request
.
source_branch
,
new_file_name
)
Flow
::
Login
.
sign_in
merge_request
.
visit!
end
it
'views the merge-base diff by default'
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347650'
do
Page
::
MergeRequest
::
Show
.
perform
do
|
mr_page
|
mr_page
.
click_diffs_tab
mr_page
.
click_target_version_dropdown
expect
(
mr_page
.
version_dropdown_content
).
to
include
(
"
#{
project
.
default_branch
}
(HEAD)"
)
expect
(
mr_page
.
version_dropdown_content
).
to
include
(
"
#{
project
.
default_branch
}
(base)"
)
expect
(
mr_page
).
to
have_file
(
merge_request
.
file_name
)
expect
(
mr_page
).
to
have_file
(
new_file_name
)
end
end
end
def
commit_to_branch
(
branch
,
file
)
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
commit
.
project
=
merge_request
.
project
commit
.
branch
=
branch
commit
.
commit_message
=
"Add new file on
#{
branch
}
"
commit
.
add_files
(
[
{
file_path:
file
,
content:
"This exists on source and target branches"
}
]
)
end
end
end
end
end
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录