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
f9023adb
Commit
f9023adb
authored
Dec 18, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec failures
parent
9e3153db
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
app/models/project_services/slack_slash_commands_service.rb
app/models/project_services/slack_slash_commands_service.rb
+1
-1
spec/features/admin/admin_settings_spec.rb
spec/features/admin/admin_settings_spec.rb
+2
-2
spec/lib/gitlab/import_export/all_models.yml
spec/lib/gitlab/import_export/all_models.yml
+1
-0
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-1
No files found.
app/models/project_services/slack_slash_commands_service.rb
View file @
f9023adb
...
@@ -2,7 +2,7 @@ class SlackSlashCommandsService < ChatSlashCommandsService
...
@@ -2,7 +2,7 @@ class SlackSlashCommandsService < ChatSlashCommandsService
include
TriggersHelper
include
TriggersHelper
def
title
def
title
'Slack
Slash
Command'
'Slack Command'
end
end
def
description
def
description
...
...
spec/features/admin/admin_settings_spec.rb
View file @
f9023adb
...
@@ -17,9 +17,9 @@ feature 'Admin updates settings', feature: true do
...
@@ -17,9 +17,9 @@ feature 'Admin updates settings', feature: true do
expect
(
page
).
to
have_content
"Application settings saved successfully"
expect
(
page
).
to
have_content
"Application settings saved successfully"
end
end
scenario
'Change Slack Service template settings'
do
scenario
'Change Slack
Notifications
Service template settings'
do
click_link
'Service Templates'
click_link
'Service Templates'
click_link
'Slack'
click_link
'Slack
notifications
'
fill_in
'Webhook'
,
with:
'http://localhost'
fill_in
'Webhook'
,
with:
'http://localhost'
fill_in
'Username'
,
with:
'test_user'
fill_in
'Username'
,
with:
'test_user'
fill_in
'service_push_channel'
,
with:
'#test_channel'
fill_in
'service_push_channel'
,
with:
'#test_channel'
...
...
spec/lib/gitlab/import_export/all_models.yml
View file @
f9023adb
...
@@ -129,6 +129,7 @@ project:
...
@@ -129,6 +129,7 @@ project:
-
builds_email_service
-
builds_email_service
-
pipelines_email_service
-
pipelines_email_service
-
mattermost_slash_commands_service
-
mattermost_slash_commands_service
-
slack_slash_commands_service
-
irker_service
-
irker_service
-
pivotaltracker_service
-
pivotaltracker_service
-
hipchat_service
-
hipchat_service
...
...
spec/models/project_spec.rb
View file @
f9023adb
...
@@ -20,7 +20,6 @@ describe Project, models: true do
...
@@ -20,7 +20,6 @@ describe Project, models: true do
it
{
is_expected
.
to
have_many
(
:deploy_keys
)
}
it
{
is_expected
.
to
have_many
(
:deploy_keys
)
}
it
{
is_expected
.
to
have_many
(
:hooks
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_many
(
:hooks
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_many
(
:protected_branches
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_many
(
:protected_branches
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_many
(
:chat_services
)
}
it
{
is_expected
.
to
have_one
(
:forked_project_link
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:forked_project_link
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:slack_notification_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:slack_notification_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:mattermost_notification_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:mattermost_notification_service
).
dependent
(
:destroy
)
}
...
@@ -37,6 +36,7 @@ describe Project, models: true do
...
@@ -37,6 +36,7 @@ describe Project, models: true do
it
{
is_expected
.
to
have_one
(
:hipchat_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:hipchat_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:flowdock_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:flowdock_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:assembla_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:assembla_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:slack_slash_commands_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:mattermost_slash_commands_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:mattermost_slash_commands_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:gemnasium_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:gemnasium_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:buildkite_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:buildkite_service
).
dependent
(
:destroy
)
}
...
...
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