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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
6b75868c
Commit
6b75868c
authored
May 25, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reproduced
parent
e5226177
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
1 deletion
+26
-1
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml
.../projects/pipeline_schedules/_pipeline_schedule.html.haml
+2
-1
spec/features/projects/pipeline_schedules_spec.rb
spec/features/projects/pipeline_schedules_spec.rb
+24
-0
No files found.
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml
View file @
6b75868c
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
=
pipeline_schedule
.
description
=
pipeline_schedule
.
description
%td
.branch-name-cell
%td
.branch-name-cell
=
icon
(
'code-fork'
)
=
icon
(
'code-fork'
)
-
if
pipeline_schedule
.
ref
.
present?
=
link_to
pipeline_schedule
.
ref
,
project_ref_path
(
@project
,
pipeline_schedule
.
ref
),
class:
"ref-name"
=
link_to
pipeline_schedule
.
ref
,
project_ref_path
(
@project
,
pipeline_schedule
.
ref
),
class:
"ref-name"
%td
%td
-
if
pipeline_schedule
.
last_pipeline
-
if
pipeline_schedule
.
last_pipeline
...
...
spec/features/projects/pipeline_schedules_spec.rb
View file @
6b75868c
...
@@ -65,6 +65,17 @@ feature 'Pipeline Schedules', :feature do
...
@@ -65,6 +65,17 @@ feature 'Pipeline Schedules', :feature do
expect
(
page
).
not_to
have_content
(
'pipeline schedule'
)
expect
(
page
).
not_to
have_content
(
'pipeline schedule'
)
end
end
end
end
context
'when ref is NULL'
do
before
do
pipeline_schedule
.
update_attribute
(
:ref
,
nil
)
visit_pipelines_schedules
end
it
'shows a list of the pipeline schedules with empty ref column'
do
expect
(
first
(
'.branch-name-cell'
).
text
).
to
eq
(
''
)
end
end
end
end
describe
'POST /projects/pipeline_schedules/new'
,
js:
true
do
describe
'POST /projects/pipeline_schedules/new'
,
js:
true
do
...
@@ -108,6 +119,19 @@ feature 'Pipeline Schedules', :feature do
...
@@ -108,6 +119,19 @@ feature 'Pipeline Schedules', :feature do
expect
(
page
).
to
have_content
(
'my brand new description'
)
expect
(
page
).
to
have_content
(
'my brand new description'
)
end
end
context
'when ref is NULL'
do
before
do
pipeline_schedule
.
update_attribute
(
:ref
,
nil
)
edit_pipeline_schedule
end
it
'shows the pipeline schedule with default ref'
do
page
.
within
(
'.git-revision-dropdown-toggle'
)
do
expect
(
first
(
'.dropdown-toggle-text'
).
text
).
to
eq
(
'master'
)
end
end
end
end
end
def
visit_new_pipeline_schedule
def
visit_new_pipeline_schedule
...
...
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