Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d0f5ddc0
Commit
d0f5ddc0
authored
Jan 11, 2022
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab master
parents
efc8d99d
54f16dd7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
...specs/features/browser_ui/1_manage/login/register_spec.rb
+1
-1
qa/qa/specs/features/ee/browser_ui/3_create/repository/file_locking_spec.rb
...es/ee/browser_ui/3_create/repository/file_locking_spec.rb
+1
-1
No files found.
qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
View file @
d0f5ddc0
...
...
@@ -13,7 +13,7 @@ module QA
end
end
RSpec
.
describe
'Manage'
,
:skip_signup_disabled
,
:requires_admin
do
RSpec
.
describe
'Manage'
,
:skip_signup_disabled
,
:requires_admin
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/349626'
,
type: :stale
}
do
describe
'while LDAP is enabled'
,
:orchestrated
,
:ldap_no_tls
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347934'
do
before
do
# When LDAP is enabled, a previous test might have created a token for the LDAP 'tanuki' user who is not an admin
...
...
qa/qa/specs/features/ee/browser_ui/3_create/repository/file_locking_spec.rb
View file @
d0f5ddc0
# frozen_string_literal: true
module
QA
RSpec
.
describe
'Create'
do
RSpec
.
describe
'Create'
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/349898'
,
type: :stale
}
do
describe
'File Locking'
do
let
(
:user_one
)
{
Resource
::
User
.
fabricate_or_use
(
Runtime
::
Env
.
gitlab_qa_username_1
,
Runtime
::
Env
.
gitlab_qa_password_1
)
}
let
(
:user_two
)
{
Resource
::
User
.
fabricate_or_use
(
Runtime
::
Env
.
gitlab_qa_username_2
,
Runtime
::
Env
.
gitlab_qa_password_2
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment