From 6407ff0adc3187f7172fa7b1ccec4237cb747244 Mon Sep 17 00:00:00 2001 From: Praburaj Date: Fri, 2 Jan 2015 17:13:31 -0800 Subject: [PATCH] Cleanup : Moving the mock code to the test project This is to make the sample code cleaner. Moved the mock code to the test project. Also fixed some intendation issues in some cshtml files. --- .../Admin/Views/StoreManager/Index.cshtml | 42 +++++++++---------- src/MusicStore/Mocks/Readme.md | 1 - src/MusicStore/Views/Account/SendCode.cshtml | 3 +- .../Components/GenreMenu/Default.cshtml | 27 ++++++------ .../Views/ShoppingCart/Index.cshtml | 34 +++++++-------- src/MusicStore/Views/Store/Browse.cshtml | 2 +- src/MusicStore/project.json | 3 +- .../Mocks/Common/CustomStateDataFormat.cs | 0 .../compiler/shared}/Mocks/Common/Helpers.cs | 0 .../FacebookMockBackChannelHttpHandler.cs | 0 .../Mocks/Facebook/FacebookNotifications.cs | 0 .../GoogleMockBackChannelHttpHandler.cs | 0 .../Mocks/Google/GoogleNotifications.cs | 0 .../MicrosoftAccountMockBackChannelHandler.cs | 0 .../MicrosoftAccountNotifications.cs | 0 test/E2ETests/compiler/shared/Mocks/Readme.md | 4 ++ .../shared}/Mocks/StartupSocialTesting.cs | 0 .../Twitter/CustomTwitterStateDataFormat.cs | 0 .../TwitterMockBackChannelHttpHandler.cs | 0 .../Mocks/Twitter/TwitterNotifications.cs | 0 20 files changed, 60 insertions(+), 56 deletions(-) delete mode 100644 src/MusicStore/Mocks/Readme.md rename {src/MusicStore => test/E2ETests/compiler/shared}/Mocks/Common/CustomStateDataFormat.cs (100%) rename {src/MusicStore => test/E2ETests/compiler/shared}/Mocks/Common/Helpers.cs (100%) rename {src/MusicStore => test/E2ETests/compiler/shared}/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs (100%) rename {src/MusicStore => test/E2ETests/compiler/shared}/Mocks/Facebook/FacebookNotifications.cs (100%) rename {src/MusicStore => test/E2ETests/compiler/shared}/Mocks/Google/GoogleMockBackChannelHttpHandler.cs (100%) rename {src/MusicStore => test/E2ETests/compiler/shared}/Mocks/Google/GoogleNotifications.cs (100%) rename {src/MusicStore => test/E2ETests/compiler/shared}/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs (100%) rename {src/MusicStore => test/E2ETests/compiler/shared}/Mocks/MicrosoftAccount/MicrosoftAccountNotifications.cs (100%) create mode 100644 test/E2ETests/compiler/shared/Mocks/Readme.md rename {src/MusicStore => test/E2ETests/compiler/shared}/Mocks/StartupSocialTesting.cs (100%) rename {src/MusicStore => test/E2ETests/compiler/shared}/Mocks/Twitter/CustomTwitterStateDataFormat.cs (100%) rename {src/MusicStore => test/E2ETests/compiler/shared}/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs (100%) rename {src/MusicStore => test/E2ETests/compiler/shared}/Mocks/Twitter/TwitterNotifications.cs (100%) diff --git a/src/MusicStore/Areas/Admin/Views/StoreManager/Index.cshtml b/src/MusicStore/Areas/Admin/Views/StoreManager/Index.cshtml index 59a3f2798c..4a4f30ab1e 100644 --- a/src/MusicStore/Areas/Admin/Views/StoreManager/Index.cshtml +++ b/src/MusicStore/Areas/Admin/Views/StoreManager/Index.cshtml @@ -4,11 +4,11 @@ { if (input.Length <= length) { - @input + @input } else { - @input.Substring(0, length)... + @input.Substring(0, length)... } } @@ -40,25 +40,25 @@ @foreach (var item in Model) { - - - @Html.DisplayFor(modelItem => item.Genre.Name) - - - @Truncate(item.Artist.Name, 25) - - - @Truncate(item.Title, 25) - - - @Html.DisplayFor(modelItem => item.Price) - - - @Html.ActionLink("Edit", "Edit", new { id = item.AlbumId }) | - @Html.ActionLink("Details", "Details", new { id = item.AlbumId }) | - @Html.ActionLink("Delete", "RemoveAlbum", new { id = item.AlbumId }) - - + + + @Html.DisplayFor(modelItem => item.Genre.Name) + + + @Truncate(item.Artist.Name, 25) + + + @Truncate(item.Title, 25) + + + @Html.DisplayFor(modelItem => item.Price) + + + @Html.ActionLink("Edit", "Edit", new { id = item.AlbumId }) | + @Html.ActionLink("Details", "Details", new { id = item.AlbumId }) | + @Html.ActionLink("Delete", "RemoveAlbum", new { id = item.AlbumId }) + + } \ No newline at end of file diff --git a/src/MusicStore/Mocks/Readme.md b/src/MusicStore/Mocks/Readme.md deleted file mode 100644 index c8ef0bd928..0000000000 --- a/src/MusicStore/Mocks/Readme.md +++ /dev/null @@ -1 +0,0 @@ -# Mock code added only for testing purposes. Not to be used for production deployments. \ No newline at end of file diff --git a/src/MusicStore/Views/Account/SendCode.cshtml b/src/MusicStore/Views/Account/SendCode.cshtml index aa3395fa9d..1752f96d57 100644 --- a/src/MusicStore/Views/Account/SendCode.cshtml +++ b/src/MusicStore/Views/Account/SendCode.cshtml @@ -5,7 +5,8 @@

@ViewBag.Title.

-@using (Html.BeginForm("SendCode", "Account", new { ReturnUrl = Model.ReturnUrl }, FormMethod.Post, new { @class = "form-horizontal", role = "form" })) { +@using (Html.BeginForm("SendCode", "Account", new { ReturnUrl = Model.ReturnUrl }, FormMethod.Post, new { @class = "form-horizontal", role = "form" })) +{ @Html.AntiForgeryToken() @Html.Hidden("rememberMe", @Model.RememberMe)

Send verification code

diff --git a/src/MusicStore/Views/Shared/Components/GenreMenu/Default.cshtml b/src/MusicStore/Views/Shared/Components/GenreMenu/Default.cshtml index 23d99215e5..cd9ed4491e 100644 --- a/src/MusicStore/Views/Shared/Components/GenreMenu/Default.cshtml +++ b/src/MusicStore/Views/Shared/Components/GenreMenu/Default.cshtml @@ -1,20 +1,19 @@ @model IEnumerable -
  • - Store -
      - @foreach (var genre in Model) - { -
    • - @Html.ActionLink(genre.Name, +
    • + Store +
        + @foreach (var genre in Model) + { +
      • + @Html.ActionLink(genre.Name, "Browse", "Store", new { Genre = genre.Name }, null) -
        • - } -
      • -
      • - @Html.ActionLink("More...", "Index", "Store")
        • - + } +
      • +
      • + @Html.ActionLink("More...", "Index", "Store") +
      -
      • + \ No newline at end of file diff --git a/src/MusicStore/Views/ShoppingCart/Index.cshtml b/src/MusicStore/Views/ShoppingCart/Index.cshtml index e1da516312..4f42fda07d 100644 --- a/src/MusicStore/Views/ShoppingCart/Index.cshtml +++ b/src/MusicStore/Views/ShoppingCart/Index.cshtml @@ -68,24 +68,24 @@ @foreach (var item in Model.CartItems) { - - - @Html.ActionLink(item.Album.Title, + + + @Html.ActionLink(item.Album.Title, "Details", "Store", new { id = item.AlbumId }, null) - - - @item.Album.Price - - - @item.Count - - - - Remove from cart - - - + + + @item.Album.Price + + + @item.Count + + + + Remove from cart + + + } diff --git a/src/MusicStore/Views/Store/Browse.cshtml b/src/MusicStore/Views/Store/Browse.cshtml index a05188fa9b..6d962d0d06 100644 --- a/src/MusicStore/Views/Store/Browse.cshtml +++ b/src/MusicStore/Views/Store/Browse.cshtml @@ -6,7 +6,7 @@

      @Model.Name Albums

      - +
        @foreach (var album in Model.Albums) { diff --git a/src/MusicStore/project.json b/src/MusicStore/project.json index e4df3da360..14f5402a86 100644 --- a/src/MusicStore/project.json +++ b/src/MusicStore/project.json @@ -5,11 +5,12 @@ "description": "Music store application on ASP.NET 5", "version": "1.0.0-*", "compilationOptions": { "warningsAsErrors": true, "define": [ "DEMO", "TESTING" ] }, + "code": [ "**/*.cs", "../../test/E2ETests/compiler/shared/**/*.cs" ], // Code from ../../test/E2ETests/compiler/shared folder is for testing only. "packExclude": "*.cmd", "webroot": "wwwroot", "dependencies": { "EntityFramework.SqlServer": "7.0.0-*", - "EntityFramework.InMemory": "7.0.0-*", //For Mono + "EntityFramework.InMemory": "7.0.0-*", // For Mono. "Kestrel": "1.0.0-*", "Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*", diff --git a/src/MusicStore/Mocks/Common/CustomStateDataFormat.cs b/test/E2ETests/compiler/shared/Mocks/Common/CustomStateDataFormat.cs similarity index 100% rename from src/MusicStore/Mocks/Common/CustomStateDataFormat.cs rename to test/E2ETests/compiler/shared/Mocks/Common/CustomStateDataFormat.cs diff --git a/src/MusicStore/Mocks/Common/Helpers.cs b/test/E2ETests/compiler/shared/Mocks/Common/Helpers.cs similarity index 100% rename from src/MusicStore/Mocks/Common/Helpers.cs rename to test/E2ETests/compiler/shared/Mocks/Common/Helpers.cs diff --git a/src/MusicStore/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs b/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs similarity index 100% rename from src/MusicStore/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs rename to test/E2ETests/compiler/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs diff --git a/src/MusicStore/Mocks/Facebook/FacebookNotifications.cs b/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookNotifications.cs similarity index 100% rename from src/MusicStore/Mocks/Facebook/FacebookNotifications.cs rename to test/E2ETests/compiler/shared/Mocks/Facebook/FacebookNotifications.cs diff --git a/src/MusicStore/Mocks/Google/GoogleMockBackChannelHttpHandler.cs b/test/E2ETests/compiler/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs similarity index 100% rename from src/MusicStore/Mocks/Google/GoogleMockBackChannelHttpHandler.cs rename to test/E2ETests/compiler/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs diff --git a/src/MusicStore/Mocks/Google/GoogleNotifications.cs b/test/E2ETests/compiler/shared/Mocks/Google/GoogleNotifications.cs similarity index 100% rename from src/MusicStore/Mocks/Google/GoogleNotifications.cs rename to test/E2ETests/compiler/shared/Mocks/Google/GoogleNotifications.cs diff --git a/src/MusicStore/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs b/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs similarity index 100% rename from src/MusicStore/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs rename to test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs diff --git a/src/MusicStore/Mocks/MicrosoftAccount/MicrosoftAccountNotifications.cs b/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountNotifications.cs similarity index 100% rename from src/MusicStore/Mocks/MicrosoftAccount/MicrosoftAccountNotifications.cs rename to test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountNotifications.cs diff --git a/test/E2ETests/compiler/shared/Mocks/Readme.md b/test/E2ETests/compiler/shared/Mocks/Readme.md new file mode 100644 index 0000000000..8af1144a4a --- /dev/null +++ b/test/E2ETests/compiler/shared/Mocks/Readme.md @@ -0,0 +1,4 @@ +# Mock code added only for testing purposes. Not to be used for production deployments. + +This code is compiled with the application by explicitly including the location in the application `project.json`'s "code" node. +It is automatically excluded from compilation of current project by its presence in the compiler\shared\** special folder. \ No newline at end of file diff --git a/src/MusicStore/Mocks/StartupSocialTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs similarity index 100% rename from src/MusicStore/Mocks/StartupSocialTesting.cs rename to test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs diff --git a/src/MusicStore/Mocks/Twitter/CustomTwitterStateDataFormat.cs b/test/E2ETests/compiler/shared/Mocks/Twitter/CustomTwitterStateDataFormat.cs similarity index 100% rename from src/MusicStore/Mocks/Twitter/CustomTwitterStateDataFormat.cs rename to test/E2ETests/compiler/shared/Mocks/Twitter/CustomTwitterStateDataFormat.cs diff --git a/src/MusicStore/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs b/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs similarity index 100% rename from src/MusicStore/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs rename to test/E2ETests/compiler/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs diff --git a/src/MusicStore/Mocks/Twitter/TwitterNotifications.cs b/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterNotifications.cs similarity index 100% rename from src/MusicStore/Mocks/Twitter/TwitterNotifications.cs rename to test/E2ETests/compiler/shared/Mocks/Twitter/TwitterNotifications.cs