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
66d4f259
Commit
66d4f259
authored
Jul 20, 2017
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename many path_with_namespace -> full_path
parent
ed91b678
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
app/services/projects/slack_application_install_service.rb
app/services/projects/slack_application_install_service.rb
+1
-1
features/steps/groups_management.rb
features/steps/groups_management.rb
+2
-2
spec/models/project_spec.rb
spec/models/project_spec.rb
+4
-4
spec/services/merge_requests/squash_service_spec.rb
spec/services/merge_requests/squash_service_spec.rb
+1
-1
spec/services/slash_commands/global_slack_handler_spec.rb
spec/services/slash_commands/global_slack_handler_spec.rb
+4
-4
No files found.
app/services/projects/slack_application_install_service.rb
View file @
66d4f259
...
@@ -19,7 +19,7 @@ module Projects
...
@@ -19,7 +19,7 @@ module Projects
service_id:
service
.
id
,
service_id:
service
.
id
,
team_id:
slack_data
[
'team_id'
],
team_id:
slack_data
[
'team_id'
],
team_name:
slack_data
[
'team_name'
],
team_name:
slack_data
[
'team_name'
],
alias:
project
.
path_with_namespace
,
alias:
project
.
full_path
,
user_id:
slack_data
[
'user_id'
]
user_id:
slack_data
[
'user_id'
]
)
)
...
...
features/steps/groups_management.rb
View file @
66d4f259
...
@@ -51,7 +51,7 @@ class Spinach::Features::GroupsManagement < Spinach::FeatureSteps
...
@@ -51,7 +51,7 @@ class Spinach::Features::GroupsManagement < Spinach::FeatureSteps
end
end
page
.
within
'.sub-nav'
do
page
.
within
'.sub-nav'
do
find
(
'a'
,
text:
'General'
).
trigger
(
'click'
)
find
(
'a'
,
text:
'General'
).
trigger
(
'click'
)
end
end
end
end
step
'I enable membership lock'
do
step
'I enable membership lock'
do
...
@@ -65,7 +65,7 @@ class Spinach::Features::GroupsManagement < Spinach::FeatureSteps
...
@@ -65,7 +65,7 @@ class Spinach::Features::GroupsManagement < Spinach::FeatureSteps
click_link
'Projects'
click_link
'Projects'
end
end
link
=
"/
#{
@project
.
path_with_namespace
}
/project_members"
link
=
"/
#{
@project
.
full_path
}
/project_members"
find
(
:xpath
,
"//a[@href=
\"
#{
link
}
\"
]"
).
click
find
(
:xpath
,
"//a[@href=
\"
#{
link
}
\"
]"
).
click
end
end
...
...
spec/models/project_spec.rb
View file @
66d4f259
...
@@ -2192,15 +2192,15 @@ describe Project do
...
@@ -2192,15 +2192,15 @@ describe Project do
let!
(
:project2
)
{
create
(
:project
)
}
let!
(
:project2
)
{
create
(
:project
)
}
it
'returns the projects matching the paths'
do
it
'returns the projects matching the paths'
do
projects
=
described_class
.
where_full_path_in
([
project1
.
path_with_namespace
,
projects
=
described_class
.
where_full_path_in
([
project1
.
full_path
,
project2
.
path_with_namespace
])
project2
.
full_path
])
expect
(
projects
).
to
contain_exactly
(
project1
,
project2
)
expect
(
projects
).
to
contain_exactly
(
project1
,
project2
)
end
end
it
'returns projects regardless of the casing of paths'
do
it
'returns projects regardless of the casing of paths'
do
projects
=
described_class
.
where_full_path_in
([
project1
.
path_with_namespace
.
upcase
,
projects
=
described_class
.
where_full_path_in
([
project1
.
full_path
.
upcase
,
project2
.
path_with_namespace
.
upcase
])
project2
.
full_path
.
upcase
])
expect
(
projects
).
to
contain_exactly
(
project1
,
project2
)
expect
(
projects
).
to
contain_exactly
(
project1
,
project2
)
end
end
...
...
spec/services/merge_requests/squash_service_spec.rb
View file @
66d4f259
...
@@ -161,7 +161,7 @@ describe MergeRequests::SquashService do
...
@@ -161,7 +161,7 @@ describe MergeRequests::SquashService do
end
end
it
'logs the MR reference and exception'
do
it
'logs the MR reference and exception'
do
expect
(
service
).
to
receive
(
:log_error
).
with
(
a_string_including
(
"
#{
project
.
path_with_namespace
}#{
merge_request
.
to_reference
}
"
))
expect
(
service
).
to
receive
(
:log_error
).
with
(
a_string_including
(
"
#{
project
.
full_path
}#{
merge_request
.
to_reference
}
"
))
expect
(
service
).
to
receive
(
:log_error
).
with
(
error
)
expect
(
service
).
to
receive
(
:log_error
).
with
(
error
)
service
.
execute
(
merge_request
)
service
.
execute
(
merge_request
)
...
...
spec/services/slash_commands/global_slack_handler_spec.rb
View file @
66d4f259
...
@@ -37,10 +37,10 @@ describe SlashCommands::GlobalSlackHandler do
...
@@ -37,10 +37,10 @@ describe SlashCommands::GlobalSlackHandler do
enable_slack_application
(
project
)
enable_slack_application
(
project
)
slack_integration
=
create
(
:slack_integration
,
service:
project
.
gitlab_slack_application_service
)
slack_integration
=
create
(
:slack_integration
,
service:
project
.
gitlab_slack_application_service
)
slack_integration
.
update
(
alias:
project
.
path_with_namespace
)
slack_integration
.
update
(
alias:
project
.
full_path
)
handler_with_valid_token
(
handler_with_valid_token
(
text:
"
#{
project
.
path_with_namespace
}
issue new title"
,
text:
"
#{
project
.
full_path
}
issue new title"
,
team_id:
slack_integration
.
team_id
team_id:
slack_integration
.
team_id
).
trigger
).
trigger
end
end
...
@@ -66,10 +66,10 @@ describe SlashCommands::GlobalSlackHandler do
...
@@ -66,10 +66,10 @@ describe SlashCommands::GlobalSlackHandler do
enable_slack_application
(
project
)
enable_slack_application
(
project
)
slack_integration
=
create
(
:slack_integration
,
service:
project
.
gitlab_slack_application_service
)
slack_integration
=
create
(
:slack_integration
,
service:
project
.
gitlab_slack_application_service
)
slack_integration
.
update
(
alias:
project
.
path_with_namespace
)
slack_integration
.
update
(
alias:
project
.
full_path
)
handler_with_valid_token
(
handler_with_valid_token
(
text:
"
#{
project
.
path_with_namespace
}
issue new title"
,
text:
"
#{
project
.
full_path
}
issue new title"
,
team_id:
slack_integration
.
team_id
team_id:
slack_integration
.
team_id
).
trigger
).
trigger
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