BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a188030d
Commit
a188030d
authored
Jan 11, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'qa/gb/define-project-pages-selectors' into 'master'
Define QA project pages views / selectors See merge request gitlab-org/gitlab-ce!16391
parents
2b8e8c68
bf05a7e7
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
19 deletions
+31
-19
_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+1
-1
_new_project_fields.html.haml
app/views/projects/_new_project_fields.html.haml
+1
-1
_clone_panel.html.haml
app/views/shared/_clone_panel.html.haml
+1
-1
new.rb
qa/qa/page/project/new.rb
+10
-8
show.rb
qa/qa/page/project/show.rb
+14
-8
namespace.rb
qa/qa/runtime/namespace.rb
+4
-0
No files found.
app/views/projects/_home_panel.html.haml
View file @
a188030d
...
...
@@ -4,7 +4,7 @@
.limit-container-width
{
class:
container_class
}
.avatar-container.s70.project-avatar
=
project_icon
(
@project
,
alt:
@project
.
name
,
class:
'avatar s70 avatar-tile'
)
%h1
.project-title
%h1
.project-title
.qa-project-name
=
@project
.
name
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
},
title:
visibility_icon_description
(
@project
)
}
=
visibility_level_icon
(
@project
.
visibility_level
,
fw:
false
)
...
...
app/views/projects/_new_project_fields.html.haml
View file @
a188030d
...
...
@@ -9,7 +9,7 @@
-
if
current_user
.
can_select_namespace?
.input-group-addon
=
root_url
=
f
.
select
:namespace_id
,
namespaces_options
(
namespace_id_from
(
params
)
||
:current_user
,
display_path:
true
,
extra_group:
namespace_id_from
(
params
)),
{},
{
class:
'select2 js-select-namespace'
,
tabindex:
1
}
=
f
.
select
:namespace_id
,
namespaces_options
(
namespace_id_from
(
params
)
||
:current_user
,
display_path:
true
,
extra_group:
namespace_id_from
(
params
)),
{},
{
class:
'select2 js-select-namespace
qa-project-namespace-select
'
,
tabindex:
1
}
-
else
.input-group-addon.static-namespace
...
...
app/views/shared/_clone_panel.html.haml
View file @
a188030d
...
...
@@ -7,7 +7,7 @@
%span
=
enabled_project_button
(
project
,
enabled_protocol
)
-
else
%a
#clone-dropdown
.btn.clone-dropdown-btn
{
href:
'#'
,
data:
{
toggle:
'dropdown'
}
}
%a
#clone-dropdown
.btn.clone-dropdown-btn
.qa-clone-dropdown
{
href:
'#'
,
data:
{
toggle:
'dropdown'
}
}
%span
=
default_clone_protocol
.
upcase
=
icon
(
'caret-down'
)
...
...
qa/qa/page/project/new.rb
View file @
a188030d
...
...
@@ -2,16 +2,18 @@ module QA
module
Page
module
Project
class
New
<
Page
::
Base
##
# TODO, define all selectors required by this page object
#
# See gitlab-org/gitlab-qa#154
#
view
'app/views/projects/new.html.haml'
view
'app/views/projects/_new_project_fields.html.haml'
do
element
:project_namespace_select
element
:project_namespace_field
,
'select :namespace_id'
element
:project_path
,
'text_field :path'
element
:project_description
,
'text_area :description'
element
:project_create_button
,
"submit 'Create project'"
end
def
choose_test_namespace
find
(
'#s2id_project_namespace_id'
).
click
find
(
'.select2-result-label'
,
text:
Runtime
::
Namespace
.
name
).
click
click_element
:project_namespace_select
first
(
'li'
,
text:
Runtime
::
Namespace
.
path
).
click
end
def
choose_name
(
name
)
...
...
qa/qa/page/project/show.rb
View file @
a188030d
...
...
@@ -2,15 +2,21 @@ module QA
module
Page
module
Project
class
Show
<
Page
::
Base
##
# TODO, define all selectors required by this page object
#
# See gitlab-org/gitlab-qa#154
#
view
'app/views/projects/show.html.haml'
view
'app/views/shared/_clone_panel.html.haml'
do
element
:clone_dropdown
element
:clone_options_dropdown
,
'.clone-options-dropdown'
end
view
'app/views/shared/_clone_panel.html.haml'
do
element
:project_repository_location
,
'text_field_tag :project_clone'
end
view
'app/views/projects/_home_panel.html.haml'
do
element
:project_name
end
def
choose_repository_clone_http
find
(
'#clone-dropdown'
).
click
click_element
:clone_dropdown
page
.
within
(
'.clone-options-dropdown'
)
do
click_link
(
'HTTP'
)
...
...
@@ -22,7 +28,7 @@ module QA
end
def
project_name
find
(
'.
project-titl
e'
).
text
find
(
'.
qa-project-nam
e'
).
text
end
def
wait_for_push
...
...
qa/qa/runtime/namespace.rb
View file @
a188030d
...
...
@@ -11,6 +11,10 @@ module QA
'qa-test-'
+
time
.
strftime
(
'%d-%m-%Y-%H-%M-%S'
)
end
def
path
"
#{
sandbox_name
}
/
#{
name
}
"
end
def
sandbox_name
'gitlab-qa-sandbox'
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