Merge pull request #47 from codymullins/bug/int-1329-async-method-params

Bug/int 1329 async method params
taxjar · Oct 30, 2020 · 7f9cdb2 · 7f9cdb2
2 parents a653c79 + 60836fa
commit 7f9cdb2
Show file tree

Hide file tree

Showing 9 changed files with 137 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,5 @@ src/packages/*
 TaxJar.dll
 Taxjar.userprefs
 
-.env
+.env
+secrets.json
diff --git a/README.md b/README.md
@@ -941,10 +941,12 @@ catch(TaxjarException e)
 
 ## Tests
 
-We use [NUnit](https://github.com/nunit/nunit) and [WireMock.Net](https://github.com/WireMock-Net/WireMock.Net) for testing. Before running the specs, create a `.env` file inside the `Taxjar.Tests` directory with your sandbox API key:
+We use [NUnit](https://github.com/nunit/nunit) and [WireMock.Net](https://github.com/WireMock-Net/WireMock.Net) for testing. Before running the specs, create a `secrets.json` file inside the `Taxjar.Tests` directory with your sandbox API Token:
 
 ```
-TAXJAR_API_KEY=YOUR_TAXJAR_SANDBOX_API_KEY
+{
+  "ApiToken": "YOUR_SANDBOX_KEY"
+}
 ```
 
 ## More Information

diff --git a/src/Taxjar.Tests/Bootstrap.cs b/src/Taxjar.Tests/Bootstrap.cs
@@ -1,8 +1,8 @@
-using NUnit.Framework;
+using System.IO;
+using Newtonsoft.Json;
+using NUnit.Framework;
 using WireMock.Server;
 using WireMock.Settings;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
 
 namespace Taxjar.Tests
 {
@@ -16,8 +16,6 @@ public class Bootstrap
         [OneTimeSetUp]
         public static void Init()
         {
-            DotNetEnv.Env.Load("../../../.env");
-
             if (server == null)
             {
                 server = FluentMockServer.Start(new FluentMockServerSettings
@@ -26,7 +24,8 @@ public static void Init()
                 });
             }
 
-            apiKey = System.Environment.GetEnvironmentVariable("TAXJAR_API_KEY") ?? "foo123";
+            var options = GetTestOptions();
+            apiKey = options.ApiToken;
             client = new TaxjarApi(apiKey, new { apiUrl = "http://localhost:9191" });
         }
 
@@ -35,5 +34,17 @@ public static void Destroy()
         {
             server.Stop();
         }
+
+        private static TestOptions GetTestOptions()
+        {
+            var json = File.ReadAllText("../../../secrets.json");
+            var options = JsonConvert.DeserializeObject<TestOptions>(json);
+            return options;
+        }
+
+        private class TestOptions
+        {
+            public string ApiToken { get; set; }
+        }
     }
 }
diff --git a/src/Taxjar.Tests/Customers.cs b/src/Taxjar.Tests/Customers.cs
@@ -1,8 +1,9 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using System;
 using System.Net;
 using System.Threading.Tasks;
+using Taxjar.Infrastructure;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 
@@ -253,6 +254,7 @@ public async Task when_updating_a_customer_async()
                     .WithBodyAsJson(body)
             );
 
+            // verify customer_id
             var customer = await Bootstrap.client.UpdateCustomerAsync(new
             {
                 customer_id = "123",
@@ -272,6 +274,27 @@ public async Task when_updating_a_customer_async()
             });
 
             AssertCustomer(customer);
+
+            // verify CustomerId
+            customer = await Bootstrap.client.UpdateCustomerAsync(new
+            {
+                CustomerId = "123",
+                exemption_type = "wholesale",
+                name = "Sterling Cooper",
+                exempt_regions = new[] {
+                    new {
+                        country = "US",
+                        state = "NY"
+                    }
+                },
+                country = "US",
+                state = "NY",
+                zip = "10010",
+                city = "New York",
+                street = "405 Madison Ave"
+            });
+
+            AssertCustomer(customer);
         }
 
         [Test]
@@ -289,7 +312,7 @@ public void when_updating_a_customer_with_missing_customer_id()
                     .WithBodyAsJson(body)
             );
 
-            var systemException = Assert.Throws<Exception>(() => Bootstrap.client.UpdateCustomer(new
+            var systemException = Assert.Throws<ArgumentException>(() => Bootstrap.client.UpdateCustomer(new
             {
                 exemption_type = "wholesale",
                 name = "Sterling Cooper",
@@ -306,7 +329,7 @@ public void when_updating_a_customer_with_missing_customer_id()
                 street = "405 Madison Ave"
             }));
 
-            Assert.AreEqual("Missing customer ID for `UpdateCustomer`", systemException.Message);
+            Assert.AreEqual(ErrorMessage.MissingCustomerId, systemException.Message);
         }
 
         [Test]

diff --git a/src/Taxjar.Tests/TaxJar.Tests.csproj b/src/Taxjar.Tests/TaxJar.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
@@ -26,7 +26,6 @@
     <PackageReference Include="RestSharp" Version="106.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="WireMock.Net.StandAlone" Version="1.0.19.0" />
-    <PackageReference Include="DotNetEnv" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Taxjar.Tests/Transactions.cs b/src/Taxjar.Tests/Transactions.cs
@@ -1,8 +1,9 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using System;
 using System.Net;
 using System.Threading.Tasks;
+using Taxjar.Infrastructure;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 
@@ -330,6 +331,7 @@ public async Task when_updating_an_order_transaction_async()
                     .WithBodyAsJson(body)
             );
 
+            // verify transaction_id
             var order = await Bootstrap.client.UpdateOrderAsync(new
             {
                 transaction_id = "123",
@@ -350,6 +352,28 @@ public async Task when_updating_an_order_transaction_async()
             });
 
             AssertOrder(order);
+
+            // verify TransactionId
+            order = await Bootstrap.client.UpdateOrderAsync(new
+            {
+                TransactionId = "123",
+                amount = 17.95,
+                shipping = 2,
+                exemption_type = "non_exempt",
+                line_items = new[] {
+                    new {
+                        quantity = 1,
+                        product_identifier = "12-34243-0",
+                        description = "Heavy Widget",
+                        product_tax_code = "20010",
+                        unit_price = 15,
+                        discount = 0,
+                        sales_tax = 0.95
+                    }
+                }
+            });
+
+            AssertOrder(order);
         }
 
         [Test]
@@ -367,7 +391,7 @@ public void when_updating_an_order_transaction_with_missing_transaction_id()
                     .WithBodyAsJson(body)
             );
 
-            var systemException = Assert.Throws<Exception>(() => Bootstrap.client.UpdateOrder(new
+            var systemException = Assert.Throws<ArgumentException>(() => Bootstrap.client.UpdateOrder(new
             {
                 amount = 17.95,
                 shipping = 2,
@@ -385,7 +409,7 @@ public void when_updating_an_order_transaction_with_missing_transaction_id()
                 }
             }));
 
-            Assert.AreEqual("Missing transaction ID for `UpdateOrder`", systemException.Message);
+            Assert.AreEqual(ErrorMessage.MissingTransactionId, systemException.Message);
         }
 
         [Test]
@@ -711,7 +735,7 @@ public void when_updating_a_refund_transaction_with_missing_transaction_id()
                     .WithBodyAsJson(body)
             );
 
-            var systemException = Assert.Throws<Exception>(() => Bootstrap.client.UpdateRefund(new
+            var systemException = Assert.Throws<ArgumentException>(() => Bootstrap.client.UpdateRefund(new
             {
                 amount = 17.95,
                 shipping = 2,
@@ -729,7 +753,7 @@ public void when_updating_a_refund_transaction_with_missing_transaction_id()
                 }
             }));
 
-            Assert.AreEqual("Missing transaction ID for `UpdateRefund`", systemException.Message);
+            Assert.AreEqual(ErrorMessage.MissingTransactionId, systemException.Message);
         }
 
         [Test]

diff --git a/src/Taxjar/Infrastructure/ErrorMessage.cs b/src/Taxjar/Infrastructure/ErrorMessage.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Text;
+
+[assembly: InternalsVisibleTo("TaxJar.Tests")]
+
+namespace Taxjar.Infrastructure
+{
+    internal static class ErrorMessage
+    {
+        public const string MissingTransactionId = "Transaction ID cannot be null or an empty string.";
+        public const string MissingCustomerId = "Customer ID cannot be null or an empty string.";
+    }
+}
diff --git a/src/Taxjar/Taxjar.csproj b/src/Taxjar/Taxjar.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>