diff --git a/AzureResourceGroupDeployment/WebSiteSQLDatabase.json b/AzureResourceGroupDeployment/WebSiteSQLDatabase.json index 0714670c..a44752e8 100644 --- a/AzureResourceGroupDeployment/WebSiteSQLDatabase.json +++ b/AzureResourceGroupDeployment/WebSiteSQLDatabase.json @@ -1,4 +1,5 @@ { + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { diff --git a/AzureResourceGroupDeployment/WebSiteSQLDatabase.parameters.json b/AzureResourceGroupDeployment/WebSiteSQLDatabase.parameters.json index e8fb7880..126965f7 100644 --- a/AzureResourceGroupDeployment/WebSiteSQLDatabase.parameters.json +++ b/AzureResourceGroupDeployment/WebSiteSQLDatabase.parameters.json @@ -3,22 +3,22 @@ "contentVersion": "1.0.0.0", "parameters": { "hostingPlanName": { - "value": "houssemdellai-service-plan" + "value": "Azuredevopspoc-prod" }, "administratorLogin": { - "value": "houssem" + "value": "devopsadmin01" }, "administratorLoginPassword": { - "value": "@Aa123456" + "value": "devops@123" }, "databaseName": { "value": "EmployeesDB" }, "webSiteName": { - "value": "houssemdellai-webapp" + "value": "azuredevopspoc-prod-webapp" }, "sqlserverName": { - "value": "houssemdellai-sql" + "value": "azuredevopspoc-prod-sql" } } -} \ No newline at end of file +} diff --git a/README.md b/README.md index 73f9977b..eda1c31c 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ Sample ASP.NET Core MVC app with database for demoing CI-CD pipelines using Azur +
https://www.youtube.com/watch?v=uVne2HXkWXI&list=PLpbcUe4chE78FEvDjD9zfzSGvsdkvkkrj&index=1 diff --git a/SeleniumUiTests/.runsettings b/SeleniumUiTests/.runsettings index ed9f58f7..9b828320 100644 --- a/SeleniumUiTests/.runsettings +++ b/SeleniumUiTests/.runsettings @@ -3,6 +3,7 @@ - + + diff --git a/SeleniumUiTests/EmployeesUiTests.cs b/SeleniumUiTests/EmployeesUiTests.cs index ed26cc92..5864f897 100644 --- a/SeleniumUiTests/EmployeesUiTests.cs +++ b/SeleniumUiTests/EmployeesUiTests.cs @@ -15,7 +15,7 @@ namespace SeleniumUiTests [TestClass] public class EmployeesUiTests { - private string _websiteURL = "https://ignite-webapp-test-997.azurewebsites.net/"; + private string _websiteURL = "https://azuredevopspoc-dev-webapp.azurewebsites.net"; private RemoteWebDriver _browserDriver; public TestContext TestContext { get; set; } @@ -27,9 +27,9 @@ public void PU_SearchTests_Initialize() [TestMethod] [TestCategory("Selenium")] - [DataRow("Adam John", "Marketing", "adam.john@email.com", "2423282992", "74 Avenue Tunis")] - [DataRow("Myriam Doe", "Sales", "myriam.doe@email.com", "2487678679", "89 Avenue Beja")] - [DataRow("Sam Yasser", "Engineering", "sam.yasser@email.com", "9627656254", "9 Rue Tabarka")] + [DataRow("bairagi rout", "Marketing", "bairagi.rout@hays.com", "2423282992", "noida")] + [DataRow("rupesh sharma", "Sales", "rupesh.sharma@hays.com", "2487678679", "delhi")] + [DataRow("dinesh yadav ", "Engineering", "dinesh.yadav@hays.com", "9627656254", "up")] public void CreateEmployee(string fullname, string department, string email, string phone, string address) { // Arrange diff --git a/WebApp.Database/dbo/Tables/Employee.sql b/WebApp.Database/dbo/Tables/Employee.sql index 8109566e..09219b2e 100644 --- a/WebApp.Database/dbo/Tables/Employee.sql +++ b/WebApp.Database/dbo/Tables/Employee.sql @@ -5,6 +5,7 @@ [Email] NVARCHAR (50) NULL, [Phone] NVARCHAR (50) NULL, [Address] NVARCHAR (50) NULL, + [country] NVARCHAR (50) NULL, CONSTRAINT [PK_Employee] PRIMARY KEY CLUSTERED ([Id] ASC) ); diff --git a/WebApp/Controllers/HomeController.cs b/WebApp/Controllers/HomeController.cs index 3dc9d087..51ed14a7 100644 --- a/WebApp/Controllers/HomeController.cs +++ b/WebApp/Controllers/HomeController.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Mvc; using WebApp.Models; + namespace WebApp.Controllers { public class HomeController : Controller diff --git a/WebApp/Program.cs b/WebApp/Program.cs index 77205605..476bfc38 100644 --- a/WebApp/Program.cs +++ b/WebApp/Program.cs @@ -23,3 +23,4 @@ public static IWebHost BuildWebHost(string[] args) => .Build(); } } + diff --git a/WebApp/Views/Employees/Create.cshtml b/WebApp/Views/Employees/Create.cshtml index e3cd4e6b..de0ab75f 100644 --- a/WebApp/Views/Employees/Create.cshtml +++ b/WebApp/Views/Employees/Create.cshtml @@ -4,6 +4,7 @@ ViewData["Title"] = "Create"; } +

Create

Employee

diff --git a/WebApp/Views/Employees/Details.cshtml b/WebApp/Views/Employees/Details.cshtml index 9db4a3dc..8ef5c499 100644 --- a/WebApp/Views/Employees/Details.cshtml +++ b/WebApp/Views/Employees/Details.cshtml @@ -1,5 +1,6 @@ @model WebApp.Models.Employee + @{ ViewData["Title"] = "Details"; } diff --git a/WebApp/Views/Home/Contact.cshtml b/WebApp/Views/Home/Contact.cshtml index a11a1867..237afc5c 100644 --- a/WebApp/Views/Home/Contact.cshtml +++ b/WebApp/Views/Home/Contact.cshtml @@ -6,12 +6,12 @@
One Microsoft Way
- Redmond, WA 98052-6399
+ Redmond, WA +919971800425
P: 425.555.0100
- Support: Support@example.com
+ Support: bairagi.rout@hays.com
Marketing: Marketing@example.com
diff --git a/WebApp/Views/_ViewStart.cshtml b/WebApp/Views/_ViewStart.cshtml index a5f10045..42bd7906 100644 --- a/WebApp/Views/_ViewStart.cshtml +++ b/WebApp/Views/_ViewStart.cshtml @@ -1,3 +1,4 @@ @{ Layout = "_Layout"; } + diff --git a/WebApp/WebApp.csproj b/WebApp/WebApp.csproj index 9e254679..f6606844 100644 --- a/WebApp/WebApp.csproj +++ b/WebApp/WebApp.csproj @@ -14,3 +14,5 @@ + +