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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a16d508e
Commit
a16d508e
authored
May 20, 2021
by
Alex Kalderimis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename assembla service
Renames `assembla_service` to `assembla_integration`
parent
8b9084b4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
app/models/integration.rb
app/models/integration.rb
+1
-1
app/models/project.rb
app/models/project.rb
+1
-1
spec/lib/gitlab/import_export/all_models.yml
spec/lib/gitlab/import_export/all_models.yml
+1
-1
spec/models/integrations/assembla_spec.rb
spec/models/integrations/assembla_spec.rb
+3
-3
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-1
No files found.
app/models/integration.rb
View file @
a16d508e
...
...
@@ -229,7 +229,7 @@ class Integration < ApplicationRecord
end
# used as part of the renaming effort
RENAMED_TO_INTEGRATION
=
%w[asana]
RENAMED_TO_INTEGRATION
=
%w[asana
assembla
]
def
self
.
available_integration_names
(
**
args
)
available_services_names
(
**
args
)
...
...
app/models/project.rb
View file @
a16d508e
...
...
@@ -156,7 +156,7 @@ class Project < ApplicationRecord
# Project integrations
has_one
:asana_integration
,
class_name:
'Integrations::Asana'
has_one
:assembla_
service
,
class_name:
'Integrations::Assembla'
has_one
:assembla_
integration
,
class_name:
'Integrations::Assembla'
has_one
:bamboo_service
,
class_name:
'Integrations::Bamboo'
has_one
:bugzilla_service
,
class_name:
'Integrations::Bugzilla'
has_one
:buildkite_service
,
class_name:
'Integrations::Buildkite'
...
...
spec/lib/gitlab/import_export/all_models.yml
View file @
a16d508e
...
...
@@ -376,7 +376,7 @@ project:
-
pivotaltracker_service
-
prometheus_service
-
flowdock_service
-
assembla_
service
-
assembla_
integration
-
asana_integration
-
slack_service
-
microsoft_teams_service
...
...
spec/models/integrations/assembla_spec.rb
View file @
a16d508e
...
...
@@ -15,8 +15,8 @@ RSpec.describe Integrations::Assembla do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
before
do
@assembla_
service
=
described_class
.
new
allow
(
@assembla_
service
).
to
receive_messages
(
@assembla_
integration
=
described_class
.
new
allow
(
@assembla_
integration
).
to
receive_messages
(
project_id:
project
.
id
,
project:
project
,
service_hook:
true
,
...
...
@@ -29,7 +29,7 @@ RSpec.describe Integrations::Assembla do
end
it
"calls Assembla API"
do
@assembla_
service
.
execute
(
@sample_data
)
@assembla_
integration
.
execute
(
@sample_data
)
expect
(
WebMock
).
to
have_requested
(
:post
,
stubbed_hostname
(
@api_url
)).
with
(
body:
/
#{
@sample_data
[
:before
]
}
.*
#{
@sample_data
[
:after
]
}
.*
#{
project
.
path
}
/
).
once
...
...
spec/models/project_spec.rb
View file @
a16d508e
...
...
@@ -54,7 +54,7 @@ RSpec.describe Project, factory_default: :keep do
it
{
is_expected
.
to
have_one
(
:irker_service
)
}
it
{
is_expected
.
to
have_one
(
:pivotaltracker_service
)
}
it
{
is_expected
.
to
have_one
(
:flowdock_service
)
}
it
{
is_expected
.
to
have_one
(
:assembla_
service
)
}
it
{
is_expected
.
to
have_one
(
:assembla_
integration
)
}
it
{
is_expected
.
to
have_one
(
:slack_slash_commands_service
)
}
it
{
is_expected
.
to
have_one
(
:mattermost_slash_commands_service
)
}
it
{
is_expected
.
to
have_one
(
:buildkite_service
)
}
...
...
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