From bb167617bfc1e63a3165fff3435f9a4d7658a205 Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Mon, 5 Jun 2017 19:36:09 +0200 Subject: [PATCH] change the FakeCampaignDto private object to an GetFakeCampaignDto funtion --- .../Controllers/CampaignsController.cs | 3 +- .../Services/Marketing/MarketingScenarios.cs | 41 +++++++++++-------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs b/src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs index 41773a78c..a525adec5 100644 --- a/src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs +++ b/src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs @@ -11,7 +11,7 @@ using System.Linq; [Route("api/v1/[controller]")] - //[Authorize] + [Authorize] public class CampaignsController : Controller { private readonly MarketingContext _context; @@ -178,6 +178,5 @@ return campaingModel; } - } } \ No newline at end of file diff --git a/test/Services/IntegrationTests/Services/Marketing/MarketingScenarios.cs b/test/Services/IntegrationTests/Services/Marketing/MarketingScenarios.cs index 931975fb8..29dcbebda 100644 --- a/test/Services/IntegrationTests/Services/Marketing/MarketingScenarios.cs +++ b/test/Services/IntegrationTests/Services/Marketing/MarketingScenarios.cs @@ -55,7 +55,8 @@ { using (var server = CreateServer()) { - var content = new StringContent(JsonConvert.SerializeObject(FakeCampaignDto), Encoding.UTF8, "application/json"); + var fakeCampaignDto = GetFakeCampaignDto(); + var content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json"); var response = await server.CreateClient() .PostAsync(Post.AddNewCampaign, content); @@ -68,7 +69,8 @@ { using (var server = CreateServer()) { - var content = new StringContent(JsonConvert.SerializeObject(FakeCampaignDto), Encoding.UTF8, "application/json"); + var fakeCampaignDto = GetFakeCampaignDto(); + var content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json"); //add campaign var campaignResponse = await server.CreateClient() @@ -91,7 +93,8 @@ { using (var server = CreateServer()) { - var content = new StringContent(JsonConvert.SerializeObject(FakeCampaignDto), Encoding.UTF8, "application/json"); + var fakeCampaignDto = GetFakeCampaignDto(); + var content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json"); //add campaign var campaignResponse = await server.CreateClient() @@ -99,8 +102,8 @@ if (int.TryParse(campaignResponse.Headers.Location.Segments[4], out int id)) { - FakeCampaignDto.Description = "FakeCampaignUpdatedDescription"; - content = new StringContent(JsonConvert.SerializeObject(FakeCampaignDto), Encoding.UTF8, "application/json"); + fakeCampaignDto.Description = "FakeCampaignUpdatedDescription"; + content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json"); var response = await server.CreateClient() .PutAsync(Put.CampaignBy(id), content); @@ -111,22 +114,24 @@ } } - - private static CampaignDTO FakeCampaignDto = new CampaignDTO + private static CampaignDTO GetFakeCampaignDto() { - Description = "FakeCampaignDescription", - From = DateTime.Now, - To = DateTime.Now.AddDays(7), - Url = "http://CampaignUrl.test/fdaf91ad0cef5419719f50198", - Rules = new List + return new CampaignDTO() { - new RuleDTO + Description = "FakeCampaignDescription", + From = DateTime.Now, + To = DateTime.Now.AddDays(7), + Url = "http://CampaignUrl.test/fdaf91ad0cef5419719f50198", + Rules = new List { - LocationId = 1, - Description = "testDescription", - RuleTypeId = 3, + new RuleDTO + { + LocationId = 1, + Description = "testDescription", + RuleTypeId = 3, + } } - } - }; + }; + } } }