Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
Container registry
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
7ecc4b66
提交
7ecc4b66
编辑于
3 years ago
作者:
Paul Gascou-Vaillancourt
提交者:
Paul Gascou-Vaillancourt
3 years ago
浏览文件
操作
下载
补丁
差异文件
Leverage logError helper
上级
5b09c084
No related branches found
No related tags found
无相关合并请求
变更
2
隐藏空白变更内容
行内
左右并排
显示
2 个更改的文件
ee/app/assets/javascripts/arkose_labs/components/sign_in_arkose_app.vue
+2
-2
2 个添加, 2 个删除
...javascripts/arkose_labs/components/sign_in_arkose_app.vue
ee/spec/frontend/arkose_labs/components/sign_in_arkose_app_spec.js
+8
-12
8 个添加, 12 个删除
...rontend/arkose_labs/components/sign_in_arkose_app_spec.js
有
10 个添加
和
14 个删除
ee/app/assets/javascripts/arkose_labs/components/sign_in_arkose_app.vue
+
2
−
2
浏览文件 @
7ecc4b66
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
import
{
uniqueId
}
from
'
lodash
'
;
import
{
uniqueId
}
from
'
lodash
'
;
import
{
GlAlert
}
from
'
@gitlab/ui
'
;
import
{
GlAlert
}
from
'
@gitlab/ui
'
;
import
{
needsArkoseLabsChallenge
}
from
'
ee/rest_api
'
;
import
{
needsArkoseLabsChallenge
}
from
'
ee/rest_api
'
;
import
{
logError
}
from
'
~/lib/logger
'
;
import
{
loadingIconForLegacyJS
}
from
'
~/loading_icon_for_legacy_js
'
;
import
{
loadingIconForLegacyJS
}
from
'
~/loading_icon_for_legacy_js
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
import
DomElementListener
from
'
~/vue_shared/components/dom_element_listener.vue
'
;
import
DomElementListener
from
'
~/vue_shared/components/dom_element_listener.vue
'
;
...
@@ -144,8 +145,7 @@ export default {
...
@@ -144,8 +145,7 @@ export default {
this
.
hideErrors
();
this
.
hideErrors
();
},
},
handleArkoseLabsFailure
(
e
)
{
handleArkoseLabsFailure
(
e
)
{
// eslint-disable-next-line no-console
logError
(
'
ArkoseLabs initialization error
'
,
e
);
console
.
error
(
'
ArkoseLabs initialization error
'
,
e
);
this
.
showArkoseFailure
=
true
;
this
.
showArkoseFailure
=
true
;
},
},
updateSubmitButtonLoading
(
val
)
{
updateSubmitButtonLoading
(
val
)
{
...
...
此差异已折叠。
点击以展开。
ee/spec/frontend/arkose_labs/components/sign_in_arkose_app_spec.js
+
8
−
12
浏览文件 @
7ecc4b66
...
@@ -3,9 +3,11 @@ import AxiosMockAdapter from 'axios-mock-adapter';
...
@@ -3,9 +3,11 @@ import AxiosMockAdapter from 'axios-mock-adapter';
import
{
mountExtended
}
from
'
helpers/vue_test_utils_helper
'
;
import
{
mountExtended
}
from
'
helpers/vue_test_utils_helper
'
;
import
SignInArkoseApp
from
'
ee/arkose_labs/components/sign_in_arkose_app.vue
'
;
import
SignInArkoseApp
from
'
ee/arkose_labs/components/sign_in_arkose_app.vue
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
{
logError
}
from
'
~/lib/logger
'
;
import
waitForPromises
from
'
helpers/wait_for_promises
'
;
import
waitForPromises
from
'
helpers/wait_for_promises
'
;
import
{
initArkoseLabsScript
}
from
'
ee/arkose_labs/init_arkose_labs_script
'
;
import
{
initArkoseLabsScript
}
from
'
ee/arkose_labs/init_arkose_labs_script
'
;
jest
.
mock
(
'
~/lib/logger
'
);
// ArkoseLabs enforcement mocks
// ArkoseLabs enforcement mocks
jest
.
mock
(
'
ee/arkose_labs/init_arkose_labs_script
'
);
jest
.
mock
(
'
ee/arkose_labs/init_arkose_labs_script
'
);
let
onShown
;
let
onShown
;
...
@@ -20,6 +22,7 @@ initArkoseLabsScript.mockImplementation(() => ({
...
@@ -20,6 +22,7 @@ initArkoseLabsScript.mockImplementation(() => ({
}));
}));
const
MOCK_USERNAME
=
'
cassiopeia
'
;
const
MOCK_USERNAME
=
'
cassiopeia
'
;
const
MOCK_PUBLIC_KEY
=
'
arkose-labs-public-api-key
'
;
describe
(
'
SignInArkoseApp
'
,
()
=>
{
describe
(
'
SignInArkoseApp
'
,
()
=>
{
let
wrapper
;
let
wrapper
;
...
@@ -44,7 +47,7 @@ describe('SignInArkoseApp', () => {
...
@@ -44,7 +47,7 @@ describe('SignInArkoseApp', () => {
createForm
(
username
);
createForm
(
username
);
wrapper
=
mountExtended
(
SignInArkoseApp
,
{
wrapper
=
mountExtended
(
SignInArkoseApp
,
{
propsData
:
{
propsData
:
{
publicKey
:
'
arkose-labs-public-api-key
'
,
publicKey
:
MOCK_PUBLIC_KEY
,
formSelector
:
makeTestIdSelector
(
'
sign-in-form
'
),
formSelector
:
makeTestIdSelector
(
'
sign-in-form
'
),
usernameSelector
:
makeTestIdSelector
(
'
username-field
'
),
usernameSelector
:
makeTestIdSelector
(
'
username-field
'
),
submitSelector
:
makeTestIdSelector
(
'
sign-in-button
'
),
submitSelector
:
makeTestIdSelector
(
'
sign-in-button
'
),
...
@@ -64,7 +67,7 @@ describe('SignInArkoseApp', () => {
...
@@ -64,7 +67,7 @@ describe('SignInArkoseApp', () => {
// Assertions
// Assertions
const
itInitializesArkoseLabs
=
()
=>
{
const
itInitializesArkoseLabs
=
()
=>
{
it
(
"
includes ArkoseLabs' script
"
,
()
=>
{
it
(
"
includes ArkoseLabs' script
"
,
()
=>
{
expect
(
initArkoseLabsScript
).
toHaveBeenCalled
(
);
expect
(
initArkoseLabsScript
).
toHaveBeenCalled
With
({
publicKey
:
MOCK_PUBLIC_KEY
}
);
});
});
it
(
'
creates a hidden input for the verification token
'
,
()
=>
{
it
(
'
creates a hidden input for the verification token
'
,
()
=>
{
...
@@ -86,6 +89,7 @@ describe('SignInArkoseApp', () => {
...
@@ -86,6 +89,7 @@ describe('SignInArkoseApp', () => {
});
});
afterEach
(()
=>
{
afterEach
(()
=>
{
axiosMock
.
restore
();
wrapper
?.
destroy
();
wrapper
?.
destroy
();
});
});
...
@@ -173,15 +177,12 @@ describe('SignInArkoseApp', () => {
...
@@ -173,15 +177,12 @@ describe('SignInArkoseApp', () => {
});
});
it
(
'
shows an error alert if the challenge fails to load
'
,
async
()
=>
{
it
(
'
shows an error alert if the challenge fails to load
'
,
async
()
=>
{
jest
.
spyOn
(
console
,
'
error
'
).
mockImplementation
(()
=>
{});
expect
(
wrapper
.
text
()).
not
.
toContain
(
wrapper
.
vm
.
$options
.
MSG_ARKOSE_FAILURE_BODY
);
expect
(
wrapper
.
text
()).
not
.
toContain
(
wrapper
.
vm
.
$options
.
MSG_ARKOSE_FAILURE_BODY
);
const
error
=
new
Error
();
const
error
=
new
Error
();
onError
(
error
);
onError
(
error
);
// eslint-disable-next-line no-console
expect
(
logError
).
toHaveBeenCalledWith
(
'
ArkoseLabs initialization error
'
,
error
);
expect
(
console
.
error
).
toHaveBeenCalledWith
(
'
ArkoseLabs initialization error
'
,
error
);
await
nextTick
();
await
nextTick
();
...
@@ -215,10 +216,6 @@ describe('SignInArkoseApp', () => {
...
@@ -215,10 +216,6 @@ describe('SignInArkoseApp', () => {
});
});
describe
(
'
when the username check fails
'
,
()
=>
{
describe
(
'
when the username check fails
'
,
()
=>
{
beforeEach
(
async
()
=>
{
jest
.
spyOn
(
console
,
'
error
'
).
mockImplementation
(()
=>
{});
});
it
(
'
with a 404, nothing happens
'
,
async
()
=>
{
it
(
'
with a 404, nothing happens
'
,
async
()
=>
{
axiosMock
.
onGet
().
reply
(
404
);
axiosMock
.
onGet
().
reply
(
404
);
initArkoseLabs
(
MOCK_USERNAME
);
initArkoseLabs
(
MOCK_USERNAME
);
...
@@ -247,8 +244,7 @@ describe('SignInArkoseApp', () => {
...
@@ -247,8 +244,7 @@ describe('SignInArkoseApp', () => {
await
waitForPromises
();
await
waitForPromises
();
expectArkoseLabsInitError
();
expectArkoseLabsInitError
();
// eslint-disable-next-line no-console
expect
(
logError
).
toHaveBeenCalledWith
(
'
ArkoseLabs initialization error
'
,
error
);
expect
(
console
.
error
).
toHaveBeenCalledWith
(
'
ArkoseLabs initialization error
'
,
error
);
});
});
});
});
});
});
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录