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
170f7906
Commit
170f7906
authored
Aug 01, 2019
by
Jason Goodman
Committed by
Kamil Trzciński
Aug 01, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Array.join rather than URI.join
Add spec for cases where URI.join does not work as expected
parent
4f750ccf
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
11 deletions
+35
-11
app/models/environment.rb
app/models/environment.rb
+1
-1
changelogs/unreleased/double-slash-64592.yml
changelogs/unreleased/double-slash-64592.yml
+5
-0
spec/models/environment_spec.rb
spec/models/environment_spec.rb
+19
-10
spec/models/project_spec.rb
spec/models/project_spec.rb
+10
-0
No files found.
app/models/environment.rb
View file @
170f7906
...
@@ -204,7 +204,7 @@ class Environment < ApplicationRecord
...
@@ -204,7 +204,7 @@ class Environment < ApplicationRecord
public_path
=
project
.
public_path_for_source_path
(
path
,
commit_sha
)
public_path
=
project
.
public_path_for_source_path
(
path
,
commit_sha
)
return
unless
public_path
return
unless
public_path
[
external_url
,
public_path
].
join
(
'/'
)
[
external_url
.
delete_suffix
(
'/'
),
public_path
.
delete_prefix
(
'/'
)
].
join
(
'/'
)
end
end
def
expire_etag_cache
def
expire_etag_cache
...
...
changelogs/unreleased/double-slash-64592.yml
0 → 100644
View file @
170f7906
---
title
:
Prevent double slash in review apps path
merge_request
:
31212
author
:
type
:
fixed
spec/models/environment_spec.rb
View file @
170f7906
...
@@ -4,6 +4,7 @@ require 'spec_helper'
...
@@ -4,6 +4,7 @@ require 'spec_helper'
describe
Environment
,
:use_clean_rails_memory_store_caching
do
describe
Environment
,
:use_clean_rails_memory_store_caching
do
include
ReactiveCachingHelpers
include
ReactiveCachingHelpers
using
RSpec
::
Parameterized
::
TableSyntax
let
(
:project
)
{
create
(
:project
,
:stubbed_repository
)
}
let
(
:project
)
{
create
(
:project
,
:stubbed_repository
)
}
subject
(
:environment
)
{
create
(
:environment
,
project:
project
)
}
subject
(
:environment
)
{
create
(
:environment
,
project:
project
)
}
...
@@ -782,12 +783,9 @@ describe Environment, :use_clean_rails_memory_store_caching do
...
@@ -782,12 +783,9 @@ describe Environment, :use_clean_rails_memory_store_caching do
let
(
:source_path
)
{
'source/file.html'
}
let
(
:source_path
)
{
'source/file.html'
}
let
(
:sha
)
{
RepoHelpers
.
sample_commit
.
id
}
let
(
:sha
)
{
RepoHelpers
.
sample_commit
.
id
}
before
do
environment
.
external_url
=
'http://example.com'
end
context
'when the public path is not known'
do
context
'when the public path is not known'
do
before
do
before
do
environment
.
external_url
=
'http://example.com'
allow
(
project
).
to
receive
(
:public_path_for_source_path
).
with
(
source_path
,
sha
).
and_return
(
nil
)
allow
(
project
).
to
receive
(
:public_path_for_source_path
).
with
(
source_path
,
sha
).
and_return
(
nil
)
end
end
...
@@ -797,12 +795,23 @@ describe Environment, :use_clean_rails_memory_store_caching do
...
@@ -797,12 +795,23 @@ describe Environment, :use_clean_rails_memory_store_caching do
end
end
context
'when the public path is known'
do
context
'when the public path is known'
do
before
do
where
(
:external_url
,
:public_path
,
:full_url
)
do
allow
(
project
).
to
receive
(
:public_path_for_source_path
).
with
(
source_path
,
sha
).
and_return
(
'file.html'
)
'http://example.com'
|
'file.html'
|
'http://example.com/file.html'
end
'http://example.com/'
|
'file.html'
|
'http://example.com/file.html'
'http://example.com'
|
'/file.html'
|
'http://example.com/file.html'
'http://example.com/'
|
'/file.html'
|
'http://example.com/file.html'
'http://example.com/subpath'
|
'public/file.html'
|
'http://example.com/subpath/public/file.html'
'http://example.com/subpath/'
|
'public/file.html'
|
'http://example.com/subpath/public/file.html'
'http://example.com/subpath'
|
'/public/file.html'
|
'http://example.com/subpath/public/file.html'
'http://example.com/subpath/'
|
'/public/file.html'
|
'http://example.com/subpath/public/file.html'
end
with_them
do
it
'returns the full external URL'
do
it
'returns the full external URL'
do
expect
(
environment
.
external_url_for
(
source_path
,
sha
)).
to
eq
(
'http://example.com/file.html'
)
environment
.
external_url
=
external_url
allow
(
project
).
to
receive
(
:public_path_for_source_path
).
with
(
source_path
,
sha
).
and_return
(
public_path
)
expect
(
environment
.
external_url_for
(
source_path
,
sha
)).
to
eq
(
full_url
)
end
end
end
end
end
end
end
...
...
spec/models/project_spec.rb
View file @
170f7906
...
@@ -2950,6 +2950,16 @@ describe Project do
...
@@ -2950,6 +2950,16 @@ describe Project do
expect
(
project
.
public_path_for_source_path
(
'file.html'
,
sha
)).
to
be_nil
expect
(
project
.
public_path_for_source_path
(
'file.html'
,
sha
)).
to
be_nil
end
end
end
end
it
'returns a public path with a leading slash unmodified'
do
route_map
=
Gitlab
::
RouteMap
.
new
(
<<-
MAP
.
strip_heredoc
)
- source: 'source/file.html'
public: '/public/file'
MAP
allow
(
project
).
to
receive
(
:route_map_for
).
with
(
sha
).
and_return
(
route_map
)
expect
(
project
.
public_path_for_source_path
(
'source/file.html'
,
sha
)).
to
eq
(
'/public/file'
)
end
end
end
context
'when there is no route map'
do
context
'when there is no route map'
do
...
...
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