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
5a2b8a93
Commit
5a2b8a93
authored
Nov 16, 2018
by
Sanad Liaquat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some refactoring done
parent
dedacada
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
25 deletions
+14
-25
qa/qa/resource/user.rb
qa/qa/resource/user.rb
+11
-0
qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
...es/browser_ui/1_manage/project/add_project_member_spec.rb
+1
-12
qa/qa/specs/features/browser_ui/3_create/repository/ee_code_owners_spec.rb
...res/browser_ui/3_create/repository/ee_code_owners_spec.rb
+2
-13
No files found.
qa/qa/resource/user.rb
View file @
5a2b8a93
...
...
@@ -76,6 +76,17 @@ module QA
}
end
def
self
.
fabricate_or_use
(
username
,
password
)
if
!
Runtime
::
Env
.
signup_disabled?
self
.
fabricate!
else
self
.
new
.
tap
do
|
user
|
user
.
username
=
username
user
.
password
=
password
end
end
end
private
def
fetch_id
(
username
)
...
...
qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
View file @
5a2b8a93
...
...
@@ -7,7 +7,7 @@ module QA
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
user
=
create_or_use_existing_user
(
Runtime
::
Env
.
gitlab_qa_username_1
,
Runtime
::
Env
.
gitlab_qa_password_1
)
user
=
Resource
::
User
.
fabricate_or_use
(
Runtime
::
Env
.
gitlab_qa_username_1
,
Runtime
::
Env
.
gitlab_qa_password_1
)
project
=
Resource
::
Project
.
fabricate!
do
|
resource
|
resource
.
name
=
'add-member-project'
...
...
@@ -21,17 +21,6 @@ module QA
expect
(
page
).
to
have_content
(
"
#{
user
.
name
}
@
#{
user
.
username
}
Given access"
)
end
def
create_or_use_existing_user
(
username
,
password
)
if
Runtime
::
Env
.
signup_disabled?
Resource
::
User
.
new
.
tap
do
|
user
|
user
.
username
=
username
user
.
password
=
password
end
else
Resource
::
User
.
fabricate!
end
end
end
end
end
qa/qa/specs/features/browser_ui/3_create/repository/ee_code_owners_spec.rb
View file @
5a2b8a93
...
...
@@ -21,8 +21,8 @@ module QA
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
@user
=
create_or_use_existing_user
(
Runtime
::
Env
.
gitlab_qa_username_1
,
Runtime
::
Env
.
gitlab_qa_password_1
)
@user2
=
create_or_use_existing_user
(
Runtime
::
Env
.
gitlab_qa_username_2
,
Runtime
::
Env
.
gitlab_qa_password_2
)
@user
=
Resource
::
User
.
fabricate_or_use
(
Runtime
::
Env
.
gitlab_qa_username_1
,
Runtime
::
Env
.
gitlab_qa_password_1
)
@user2
=
Resource
::
User
.
fabricate_or_use
(
Runtime
::
Env
.
gitlab_qa_username_2
,
Runtime
::
Env
.
gitlab_qa_password_2
)
@project
=
Resource
::
Project
.
fabricate!
do
|
project
|
project
.
name
=
"codeowners"
...
...
@@ -73,17 +73,6 @@ module QA
expect
(
page
).
to
have_content
(
@user2
.
name
)
expect
(
page
).
not_to
have_content
(
@user
.
name
)
end
def
create_or_use_existing_user
(
username
,
password
)
if
Runtime
::
Env
.
signup_disabled?
Resource
::
User
.
new
.
tap
do
|
user
|
user
.
username
=
username
user
.
password
=
password
end
else
Resource
::
User
.
fabricate!
end
end
end
end
end
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