Merge pull request #47 from CallFire/develop

Develop

Author: vmalinovskiy

CallfireApiClient.nuspec

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><package>
   <metadata>
     <id>CallfireApiClient</id>
-    <version>1.1.16</version>
+    <version>1.1.17</version>
     <title>CallFire API v2 client</title>
     <authors>
       Vladimir Mikhailov
@@ -15,6 +15,11 @@
     <description>C# client library for integration with Callfire REST API v2 services</description>
     <releaseNotes>Callfire API client Changelog
 =============================
+Version 1.1.17 - May 4 2017
+- removed subscriptions api (not supported from v2 api client)
+- fixed findWebhooks api to use enums instead strings
+- trivial tests fixes
+
 Version 1.1.16 - Mar 28 2017
 - fixed DayOfWeek enum for scheduler
 

Changelog.txt

@@ -1,5 +1,10 @@
 Callfire API client Changelog
 =============================
+Version 1.1.17 - May 4 2017
+- removed subscriptions api (not supported from v2 api client)
+- fixed findWebhooks api to use enums instead strings
+- trivial tests fixes
+
 Version 1.1.16 - Mar 28 2017
 - fixed DayOfWeek enum for scheduler
 

src/CallfireApiClient.IntegrationTests/Api/Campaigns/CallBroadcastsApiIntegrationTest.cs

@@ -105,7 +105,7 @@ public void StartStopArchiveCampaign()
                     new Recipient { PhoneNumber = "14246525473" }
                 }
             };
-            var id = Client.CallBroadcastsApi.Create(broadcast, true);
+            var id = Client.CallBroadcastsApi.Create(broadcast, false);
 
             CallBroadcast campaign = Client.CallBroadcastsApi.Get(id.Id);
             System.Console.WriteLine(campaign);
@@ -134,7 +134,7 @@ public void GetBroadcastCalls()
 
             long testBatchId = (long) calls.Items[0].BatchId;
 
-            getCallsRequest = new GetBroadcastCallsTextsRequest { Id = 1, batchId = testBatchId };
+            getCallsRequest = new GetBroadcastCallsTextsRequest { Id = 1, BatchId = testBatchId };
             calls = Client.CallBroadcastsApi.GetCalls(getCallsRequest);
             System.Console.WriteLine(calls);
             Assert.AreEqual(calls.Items[0].BatchId, testBatchId);

src/CallfireApiClient.IntegrationTests/Api/Campaigns/TextBroadcastsApiIntegrationTest.cs

@@ -103,7 +103,7 @@ public void GetBroadcastTexts()
 
             long testBatchId = (long)texts.Items[0].BatchId;
 
-            request = new GetBroadcastCallsTextsRequest { Id = broadcastId.Id, batchId = testBatchId };
+            request = new GetBroadcastCallsTextsRequest { Id = broadcastId.Id, BatchId = testBatchId };
             texts = Client.TextBroadcastsApi.GetTexts(request);
             Assert.AreEqual(texts.Items[0].BatchId, testBatchId);
         }

src/CallfireApiClient.IntegrationTests/Api/Contacts/DncApiIntegrationTest.cs

@@ -14,6 +14,15 @@ public class DncApiIntegrationTest : AbstractIntegrationTest
         [Test]
         public void FindDncs()
         {
+            CreateDncsRequest crRequest = new CreateDncsRequest()
+            {
+                Call = true,
+                Text = true,
+                Numbers = new List<string> { "12135551189" },
+                Source = "testSourceForGetDncByNumber"
+            };
+            Client.DncApi.Create(crRequest);
+
             var request = new FindDncNumbersRequest()
             {
                 Text = true,
@@ -26,6 +35,8 @@ public void FindDncs()
 
             Assert.NotNull(dncs);
             Assert.AreEqual(dncs.Items.Count, 1);
+
+            Client.DncApi.Delete("12135551189");
         }
 
         [Test]

src/CallfireApiClient.IntegrationTests/Api/Webhooks/SubscriptionsApiIntegrationTest.cs

@@ -57,7 +57,6 @@
     <Compile Include="Api\Keywords\KeywordsApiIntegrationTest.cs" />
     <Compile Include="Api\Numbers\NumberLeasesApiIntegrationTest.cs" />
     <Compile Include="Api\Numbers\NumbersApiIntegrationTest.cs" />
-    <Compile Include="Api\Webhooks\SubscriptionsApiIntegrationTest.cs" />
     <Compile Include="Api\Webhooks\WebhooksApiIntegrationTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Api\AbstractIntegrationTest.cs" />

src/CallfireApiClient.IntegrationTests/CallfireApiClient.IntegrationTests.csproj

@@ -229,7 +229,7 @@ public void GetCallsWithGetByIdAndBatchIdRequest()
                 Offset = 5,
                 Fields = FIELDS,
                 Id = 11,
-                batchId = 13
+                BatchId = 13
             };
             var calls = Client.CallBroadcastsApi.GetCalls(request);
             Assert.That(Serializer.Serialize(calls), Is.EqualTo(expectedJson));

src/CallfireApiClient.Tests/Api/Campaigns/CallBroadcastsApiTest.cs

@@ -168,7 +168,7 @@ public void GetTextsWithGetByIdAndBatchIdRequest()
                 Offset = 5,
                 Fields = FIELDS,
                 Id = 11,
-                batchId = 13
+                BatchId = 13
             };
             var texts = Client.TextBroadcastsApi.GetTexts(request);
             Assert.That(Serializer.Serialize(texts), Is.EqualTo(expectedJson));