Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull02 #26

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a905752
Update WebSiteSQLDatabase.parameters.json
routba1 Dec 31, 2019
a705918
Update WebSiteSQLDatabase.parameters.json
routba1 Dec 31, 2019
c54f158
Update WebSiteSQLDatabase.parameters.json
routba1 Dec 31, 2019
0ae1ebc
Update WebSiteSQLDatabase.parameters.json
routba1 Dec 31, 2019
6f18bd0
Update Contact.cshtml
routba1 Dec 31, 2019
3990353
Update .runsettings
routba1 Dec 31, 2019
efedf76
Update EmployeesUiTests.cs
routba1 Dec 31, 2019
15c8f84
Update Contact.cshtml
routba1 Dec 31, 2019
8b741d8
Update WebSiteSQLDatabase.parameters.json
routba1 Jan 1, 2020
96f29ec
Update WebSiteSQLDatabase.parameters.json
routba1 Jan 1, 2020
0e0e7c6
Update .runsettings
routba1 Jan 1, 2020
55cc5a5
Update EmployeesUiTests.cs
routba1 Jan 1, 2020
cb70c90
Update Index.cshtml
routba1 Jan 1, 2020
666b6bb
Update Index.cshtml
routba1 Jan 1, 2020
1fcd636
Update Employee.sql
routba1 Jan 2, 2020
9e6e232
Update Employee.sql
routba1 Jan 2, 2020
d04c555
Update Contact.cshtml
routba1 Jan 2, 2020
bcd7dc1
Update .runsettings
routba1 Jan 5, 2020
bf232cf
Update Details.cshtml
routba1 Jan 5, 2020
e4bda1c
Update Details.cshtml
routba1 Jan 5, 2020
3b9c550
Update Details.cshtml
routba1 Jan 5, 2020
9e13d42
Update .runsettings
routba1 Jan 10, 2020
8724e5c
Merge pull request #2 from routba1/branch01
routba1 Jan 10, 2020
fcc98ba
Update Program.cs
routba1 Jan 11, 2020
9fb254b
Merge pull request #3 from routba1/sales01
routba1 Jan 11, 2020
00f4ae7
Update WebApp.csproj
routba1 Jan 11, 2020
0c81077
Merge pull request #5 from routba1/pull01
routba1 Jan 11, 2020
020a9a8
Update Create.cshtml
routba1 Jan 11, 2020
4a4618c
Update Contact.cshtml
routba1 Jan 12, 2020
91acea0
Merge pull request #8 from routba1/feature01
routba1 Jan 12, 2020
2cd3d30
Update Startup.cs
routba1 Jan 12, 2020
ded2d44
Update README.md
routba1 Jan 12, 2020
a26421a
Update HomeController.cs
routba1 Jan 12, 2020
5d4c01d
Update _ViewStart.cshtml
routba1 Jan 18, 2020
cce2b72
Update WebSiteSQLDatabase.json
routba1 Jan 18, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AzureResourceGroupDeployment/WebSiteSQLDatabase.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{

"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
Expand Down
12 changes: 6 additions & 6 deletions AzureResourceGroupDeployment/WebSiteSQLDatabase.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
}
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Sample ASP.NET Core MVC app with database for demoing CI-CD pipelines using Azur
<img src="http://azuredeploy.net/deploybutton.png" style="max-width:100%;">
</a>


</br>

https://www.youtube.com/watch?v=uVne2HXkWXI&list=PLpbcUe4chE78FEvDjD9zfzSGvsdkvkkrj&index=1
3 changes: 2 additions & 1 deletion SeleniumUiTests/.runsettings
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<RunSettings>
<!-- Parameters used by tests at runtime -->
<TestRunParameters>
<Parameter name="webAppUrl" value="https://ignite-webapp-test-997.azurewebsites.net/" />
<Parameter name="webAppUrl" value=$(WebAppNameUrl) />
</TestRunParameters>
</RunSettings>

8 changes: 4 additions & 4 deletions SeleniumUiTests/EmployeesUiTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions WebApp.Database/dbo/Tables/Employee.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);

1 change: 1 addition & 0 deletions WebApp/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using WebApp.Models;


namespace WebApp.Controllers
{
public class HomeController : Controller
Expand Down
1 change: 1 addition & 0 deletions WebApp/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ public static IWebHost BuildWebHost(string[] args) =>
.Build();
}
}

1 change: 1 addition & 0 deletions WebApp/Views/Employees/Create.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
ViewData["Title"] = "Create";
}


<h2>Create</h2>

<h4>Employee</h4>
Expand Down
1 change: 1 addition & 0 deletions WebApp/Views/Employees/Details.cshtml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@model WebApp.Models.Employee


@{
ViewData["Title"] = "Details";
}
Expand Down
4 changes: 2 additions & 2 deletions WebApp/Views/Home/Contact.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

<address>
One Microsoft Way<br />
Redmond, WA 98052-6399<br />
Redmond, WA +919971800425<br />
<abbr title="Phone">P:</abbr>
425.555.0100
</address>

<address>
<strong>Support:</strong> <a href="mailto:[email protected]">Support@example.com</a><br />
<strong>Support:</strong> <a href="mailto:[email protected]">bairagi.rout@hays.com</a><br />
<strong>Marketing:</strong> <a href="mailto:[email protected]">[email protected]</a>
</address>
1 change: 1 addition & 0 deletions WebApp/Views/_ViewStart.cshtml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@{
Layout = "_Layout";
}

2 changes: 2 additions & 0 deletions WebApp/WebApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@
</ItemGroup>

</Project>