Skip to content

/unsafe added to urls created by toMetaUnsafe() #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andyf9 wants to merge 2 commits into
base: trunk
Choose a base branch
from
+3 −3
Open

/unsafe added to urls created by toMetaUnsafe() #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
083155d
/unsafe added to urls created by toMetaUnsafe()
andyf9 Apr 27, 2017
0011cd6
Test updated to match expected behaviour
andyf9 May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/squareup/pollexor/ThumborUrlBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ public String toMeta() {

/** Build an unsafe version of the metadata URL. */
public String toMetaUnsafe() {
return host + assembleConfig(true);
return host + PREFIX_UNSAFE + assembleConfig(true);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/squareup/pollexor/ThumborUrlBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public class ThumborUrlBuilderTest {
}

@Test public void testBuildMeta() {
assertThat(unsafe.buildImage("a.com/b.png").toMeta()).startsWith("/meta/");
assertThat(unsafe.buildImage("a.com/b.png").toMeta()).startsWith("/unsafe/meta/");
}

@Test public void testSafeUrlCanStillBuildUnsafe() {
Expand All @@ -91,7 +91,7 @@ public class ThumborUrlBuilderTest {
}

@Test public void testSafeMetaUrlCanStillBuildUnsafe() {
String expected = "/meta/a.com/b.png";
String expected = "/unsafe/meta/a.com/b.png";
String actual = safe.buildImage("a.com/b.png").toMetaUnsafe();
assertThat(actual).isEqualTo(expected);
}
Expand Down