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
Jérome Perrin
gitlab-ce
Commits
6838c16c
Commit
6838c16c
authored
Jun 02, 2017
by
kushalpandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor refactor based on review feedback
parent
b487a32c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
app/views/shared/_field.html.haml
app/views/shared/_field.html.haml
+1
-1
spec/features/projects/services/jira_service_spec.rb
spec/features/projects/services/jira_service_spec.rb
+2
-1
No files found.
app/views/shared/_field.html.haml
View file @
6838c16c
...
@@ -23,6 +23,6 @@
...
@@ -23,6 +23,6 @@
-
elsif
type
==
'select'
-
elsif
type
==
'select'
=
form
.
select
name
,
options_for_select
(
choices
,
value
?
value
:
default_choice
),
{},
{
class:
"form-control"
}
=
form
.
select
name
,
options_for_select
(
choices
,
value
?
value
:
default_choice
),
{},
{
class:
"form-control"
}
-
elsif
type
==
'password'
-
elsif
type
==
'password'
=
form
.
password_field
name
,
autocomplete:
"new-password"
,
class:
"form-control"
,
required:
value
.
present?
?
nil
:
:required
=
form
.
password_field
name
,
autocomplete:
"new-password"
,
class:
"form-control"
,
required:
value
.
blank?
&&
:required
-
if
help
-
if
help
%span
.help-block
=
help
%span
.help-block
=
help
spec/features/projects/services/jira_service_spec.rb
View file @
6838c16c
...
@@ -65,7 +65,8 @@ feature 'Setup Jira service', :feature, :js do
...
@@ -65,7 +65,8 @@ feature 'Setup Jira service', :feature, :js do
click_button
(
'Test settings and save changes'
)
click_button
(
'Test settings and save changes'
)
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_content
(
'Test failed.Save anyway'
)
expect
(
find
(
'.flash-container-page'
)).
to
have_content
'Test failed.'
expect
(
find
(
'.flash-container-page'
)).
to
have_content
'Save anyway'
find
(
'.flash-alert .flash-action'
).
trigger
(
'click'
)
find
(
'.flash-alert .flash-action'
).
trigger
(
'click'
)
wait_for_requests
wait_for_requests
...
...
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