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
Boxiang Sun
gitlab-ce
Commits
3cd1eda5
Commit
3cd1eda5
authored
Jan 16, 2015
by
Jeremy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add restrict_to_branch to service controller
And add restrict_to_branch to spec
parent
b4d9ceb2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
app/controllers/projects/services_controller.rb
app/controllers/projects/services_controller.rb
+1
-1
features/steps/project/services.rb
features/steps/project/services.rb
+2
-0
spec/models/asana_service_spec.rb
spec/models/asana_service_spec.rb
+3
-1
No files found.
app/controllers/projects/services_controller.rb
View file @
3cd1eda5
...
@@ -47,7 +47,7 @@ class Projects::ServicesController < Projects::ApplicationController
...
@@ -47,7 +47,7 @@ class Projects::ServicesController < Projects::ApplicationController
:room
,
:recipients
,
:project_url
,
:webhook
,
:room
,
:recipients
,
:project_url
,
:webhook
,
:user_key
,
:device
,
:priority
,
:sound
,
:bamboo_url
,
:username
,
:password
,
:user_key
,
:device
,
:priority
,
:sound
,
:bamboo_url
,
:username
,
:password
,
:build_key
,
:server
,
:teamcity_url
,
:build_type
,
:build_key
,
:server
,
:teamcity_url
,
:build_type
,
:description
,
:issues_url
,
:new_issue_url
:description
,
:issues_url
,
:new_issue_url
,
:restrict_to_branch
)
)
end
end
end
end
features/steps/project/services.rb
View file @
3cd1eda5
...
@@ -110,11 +110,13 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
...
@@ -110,11 +110,13 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
step
'I fill Asana settings'
do
step
'I fill Asana settings'
do
check
'Active'
check
'Active'
fill_in
'Api key'
,
with:
'verySecret'
fill_in
'Api key'
,
with:
'verySecret'
fill_in
'Restrict to branch'
,
with:
'master'
click_button
'Save'
click_button
'Save'
end
end
step
'I should see Asana service settings saved'
do
step
'I should see Asana service settings saved'
do
find_field
(
'Api key'
).
value
.
should
==
'verySecret'
find_field
(
'Api key'
).
value
.
should
==
'verySecret'
find_field
(
'Restrict to branch'
).
value
.
should
==
'master'
end
end
step
'I click email on push service link'
do
step
'I click email on push service link'
do
...
...
spec/models/asana_service_spec.rb
View file @
3cd1eda5
...
@@ -27,6 +27,7 @@ describe AsanaService, models: true do
...
@@ -27,6 +27,7 @@ describe AsanaService, models: true do
end
end
it
{
should
validate_presence_of
:api_key
}
it
{
should
validate_presence_of
:api_key
}
it
{
should
validate_presence_of
:restrict_to_branch
}
end
end
end
end
...
@@ -40,7 +41,8 @@ describe AsanaService, models: true do
...
@@ -40,7 +41,8 @@ describe AsanaService, models: true do
project:
project
,
project:
project
,
project_id:
project
.
id
,
project_id:
project
.
id
,
service_hook:
true
,
service_hook:
true
,
api_key:
'verySecret'
api_key:
'verySecret'
,
restrict_to_branch:
'master'
)
)
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