Skip to content

Commit

Permalink
fix(repo): change cookies to obj and fix string interpretation of array
Browse files Browse the repository at this point in the history
  • Loading branch information
@AJCJ1 @cjroebuck
AJCJ1 authored and cjroebuck committed Jan 21, 2025
1 parent a26001c commit 37b80e5
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 22 deletions.
94 changes: 75 additions & 19 deletions Urlbox.MsTest/UrlboxTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,69 @@ public void TestInitialize()
public void GenerateUrlboxUrl_WithAllOptions()
{
var output = dummyUrlbox.GenerateUrlboxUrl(urlboxAllOptions);
Console.WriteLine(output);

Assert.AreEqual(
"https://api.urlbox.com/v1/MY_API_KEY/755a40f67ca365e979086eddd0d2cab7e7612174/png?url=https%3A%2F%2Furlbox.com&html=test&width=123&height=123&full_page=true&selector=test&clip=test&gpu=true&response_type=test&block_ads=true&hide_cookie_banners=true&click_accept=true&block_urls=%5Btest%2Ctest2%5D&block_images=true&block_fonts=true&block_medias=true&block_styles=true&block_scripts=true&block_frames=true&block_fetch=true&block_xhr=true&block_sockets=true&hide_selector=test&js=test&css=test&dark_mode=true&reduced_motion=true&retina=true&thumb_width=123&thumb_height=123&img_fit=test&img_position=test&img_bg=test&img_pad=123&quality=123&transparent=true&max_height=123&download=test&pdf_page_size=test&pdf_page_range=test&pdf_page_width=123&pdf_page_height=123&pdf_margin=test&pdf_margin_top=123&pdf_margin_right=123&pdf_margin_bottom=123&pdf_margin_left=123&pdf_auto_crop=true&pdf_scale=0.12&pdf_orientation=test&pdf_background=true&disable_ligatures=true&media=test&pdf_show_header=true&pdf_header=test&pdf_show_footer=true&pdf_footer=test&readable=true&force=true&unique=test&ttl=123&proxy=test&header=test&cookie=test&user_agent=test&platform=test&accept_lang=test&authorization=test&tz=test&engine_version=test&delay=123&timeout=123&wait_until=test&wait_for=test&wait_to_leave=test&wait_timeout=123&fail_if_selector_missing=true&fail_if_selector_present=true&fail_on4xx=true&fail_on5xx=true&scroll_to=test&click=test&click_all=test&hover=test&bg_color=test&disable_js=true&full_page_mode=test&full_width=true&allow_infinite=true&skip_scroll=true&detect_full_height=true&max_section_height=123&scroll_increment=test&scroll_delay=123&highlight=test&highlight_fg=test&highlight_bg=test&latitude=0.12&longitude=0.12&accuracy=123&use_s3=true&s3_path=test&s3_bucket=test&s3_endpoint=test&s3_region=test&cdn_host=test&s3_storage_class=test",
"https://api.urlbox.com/v1/MY_API_KEY/ab13d1b51816149ebfbe66374358cf2c4285f578/png?url=https%3A%2F%2Furlbox.com&html=test&width=123&height=123&full_page=true&selector=test&clip=test&gpu=true&response_type=test&block_ads=true&hide_cookie_banners=true&click_accept=true&block_urls=test%2Ctest2&block_images=true&block_fonts=true&block_medias=true&block_styles=true&block_scripts=true&block_frames=true&block_fetch=true&block_xhr=true&block_sockets=true&hide_selector=test&js=test&css=test&dark_mode=true&reduced_motion=true&retina=true&thumb_width=123&thumb_height=123&img_fit=test&img_position=test&img_bg=test&img_pad=123&quality=123&transparent=true&max_height=123&download=test&pdf_page_size=test&pdf_page_range=test&pdf_page_width=123&pdf_page_height=123&pdf_margin=test&pdf_margin_top=123&pdf_margin_right=123&pdf_margin_bottom=123&pdf_margin_left=123&pdf_auto_crop=true&pdf_scale=0.12&pdf_orientation=test&pdf_background=true&disable_ligatures=true&media=test&pdf_show_header=true&pdf_header=test&pdf_show_footer=true&pdf_footer=test&readable=true&force=true&unique=test&ttl=123&proxy=test&header=test&cookie=test&user_agent=test&platform=test&accept_lang=test&authorization=test&tz=test&engine_version=test&delay=123&timeout=123&wait_until=test&wait_for=test&wait_to_leave=test&wait_timeout=123&fail_if_selector_missing=true&fail_if_selector_present=true&fail_on4xx=true&fail_on5xx=true&scroll_to=test&click=test&click_all=test&hover=test&bg_color=test&disable_js=true&full_page_mode=test&full_width=true&allow_infinite=true&skip_scroll=true&detect_full_height=true&max_section_height=123&scroll_increment=test&scroll_delay=123&highlight=test&highlight_fg=test&highlight_bg=test&latitude=0.12&longitude=0.12&accuracy=123&use_s3=true&s3_path=test&s3_bucket=test&s3_endpoint=test&s3_region=test&cdn_host=test&s3_storage_class=test",
output
);
}

[TestMethod]
public void GenerateUrlboxUrl_withMultipleCookies()
{
UrlboxOptions options = new UrlboxOptions(url: "https://urlbox.com");
options.Cookie = new string[] {
"some=cookie",
"some=otherCookie",
"some=thirdCookie"
};
var output = dummyUrlbox.GenerateUrlboxUrl(options);

Assert.AreEqual(
"https://api.urlbox.com/v1/MY_API_KEY/875571589b83579c5bd98b2724fee1e942e6191b/png?url=https%3A%2F%2Furlbox.com&cookie=some%3Dcookie%2Csome%3DotherCookie%2Csome%3DthirdCookie",
output
);
}

[TestMethod]
public void GenerateUrlboxUrl_withOneCookie()
{
UrlboxOptions options = new UrlboxOptions(url: "https://urlbox.com");
options.Cookie = "some=cookie";

var output = dummyUrlbox.GenerateUrlboxUrl(options);

Assert.AreEqual(
"https://api.urlbox.com/v1/MY_API_KEY/98443bad9c26ff2ec632a88a5ca81042a8f01f6e/png?url=https%3A%2F%2Furlbox.com&cookie=some%3Dcookie",
output
);
}

[TestMethod]
public void GenerateUrlboxUrl_withMultipleBlockUrls()
{
UrlboxOptions options = new UrlboxOptions(url: "https://shopify.com");
options.BlockUrls = new string[] { "cdn.shopify.com", "otherDomain" };

var output = dummyUrlbox.GenerateUrlboxUrl(options);

Assert.AreEqual(
"https://api.urlbox.com/v1/MY_API_KEY/d8b2541a21203c7277ce450623e4d5821b09b7ce/png?url=https%3A%2F%2Fshopify.com&block_urls=cdn.shopify.com%2CotherDomain",
output
);
}

[TestMethod]
public void GenerateUrlboxUrl_withOneBlockUrl()
{

UrlboxOptions options = new UrlboxOptions(url: "https://shopify.com");
options.BlockUrls = new string[] { "cdn.shopify.com" };

var output = dummyUrlbox.GenerateUrlboxUrl(options);

Assert.AreEqual(
"https://api.urlbox.com/v1/MY_API_KEY/1d35723ba9b60ec38ccdb01d066665c788002f17/png?url=https%3A%2F%2Fshopify.com&block_urls=cdn.shopify.com",
output
);
}
Expand Down Expand Up @@ -209,6 +268,8 @@ public void GenerateUrlboxUrl_IgnoreEmptyValuesAndFormat()
options.Format = "pdf";
options.Selector = "";
options.WaitFor = "";
options.BlockUrls = new string[] { };
options.Cookie = "";

var output = dummyUrlbox.GenerateUrlboxUrl(options);
Assert.AreEqual("https://api.urlbox.com/v1/MY_API_KEY/8e00ad9a8d7c4abcd462a9b8ec041c3661f13995/png?url=https%3A%2F%2Fbbc.co.uk",
Expand Down Expand Up @@ -257,32 +318,21 @@ public void GenerateUrlboxUrl_ShouldRemoveFormatFromQueryString()
}

[TestMethod]
public async Task Render_Succeeds()
public async Task RenderSync_Succeeds()
{
UrlboxOptions options = new UrlboxOptions(url: "https://urlbox.com");
// options.BlockUrls = true;
// options.FullPage = true;
options.ClickAccept = true;
var result = await urlbox.Render(options);

Assert.IsInstanceOfType(result, typeof(SyncUrlboxResponse));
Assert.IsNotNull(result.RenderUrl);
Assert.IsNotNull(result.Size);
}

[TestMethod]
public async Task Render_ThrowsException()
{
UrlboxOptions options = new UrlboxOptions(url: "https://doesnotexistZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ.com");
var exception = Assert.ThrowsExceptionAsync<ArgumentException>(async () => await urlbox.Render(options));
Assert.IsTrue(exception.Result.Message.Contains("Could not make post request to https://api.urlbox.com/v1/render/sync"));
}


[TestMethod]
public async Task RenderAsync_Succeeds()
{
UrlboxOptions options = new UrlboxOptions(url: "https://urlbox.com");
options.BlockUrls = new string[] { "test" };
// options.FullPage = true;
options.ClickAccept = true;
var result = await urlbox.RenderAsync(options);

Expand All @@ -292,16 +342,22 @@ public async Task RenderAsync_Succeeds()
Assert.IsNotNull(result.StatusUrl);
}

[TestMethod]
public async Task Render_ThrowsException()
{
UrlboxOptions options = new UrlboxOptions(url: "https://doesnotexistZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ.com");
var exception = Assert.ThrowsExceptionAsync<ArgumentException>(async () => await urlbox.Render(options));
Assert.IsTrue(exception.Result.Message.Contains("Could not make post request to https://api.urlbox.com/v1/render/sync"));
}


[TestMethod]
public async Task RenderAsync_ThrowsException()
{
UrlboxOptions options = new UrlboxOptions(url: "https://doesnotexistZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ.com");
var exception = Assert.ThrowsExceptionAsync<ArgumentException>(async () => await urlbox.RenderAsync(options));
Assert.IsTrue(exception.Result.Message.Contains("Could not make post request to https://api.urlbox.com/v1/render/async"));
}



}

[TestClass]
Expand Down
3 changes: 1 addition & 2 deletions Urlbox/Urlbox/UrlGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ private static string ConvertToString(object value)
{
if (value is string[] stringArray)
{
// String wrapped keys in a string representation of an array
return $"[\"{string.Join("\",\"", stringArray)}\"]";
return $"{string.Join(",", stringArray)}";
}

var result = Convert.ToString(value);
Expand Down
2 changes: 1 addition & 1 deletion Urlbox/Urlbox/Urlbox.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ public UrlboxOptions(string url = null, string html = null)
public int Ttl { get; set; }
public string Proxy { get; set; }
public string Header { get; set; }
public string Cookie { get; set; }
public object Cookie { get; set; }
public string UserAgent { get; set; }
public string Platform { get; set; }
public string AcceptLang { get; set; }
Expand Down

0 comments on commit 37b80e5

Please sign in to comment.