Fixes after testing

lihini · Feb 23, 2014 · e08d103 · e08d103
1 parent dce3003
commit e08d103
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 14 deletions.
diff --git a/JavaScript.AMD.Chutzpah/readme.txt b/JavaScript.AMD.Chutzpah/readme.txt
@@ -1,3 +1,3 @@
 Readme:
 -----------------------
-* Set "TypeScript" mode in Chutzpah Visual Studio AddIn and restart Visual Studio
+* Set "JavaScript" mode in Chutzpah Visual Studio AddIn and restart Visual Studio
diff --git a/JavaScript.NoAMD.Chutzpah/FrontEndTools.sln b/JavaScript.NoAMD.Chutzpah/FrontEndTools.sln
@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FrontEndTools.WebUI.Scripts
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{73CE7725-46B7-4067-8D6C-B35BAE9C3045}"
 	ProjectSection(SolutionItems) = preProject
-		FrontEndTools.WebUI\chutzpah.json = FrontEndTools.WebUI\chutzpah.json
+		chutzpah.json = chutzpah.json
 	EndProjectSection
 EndProject
 Global

diff --git a/JavaScript.NoAMD.Chutzpah/Screenshot.png b/JavaScript.NoAMD.Chutzpah/Screenshot.png
diff --git a/JavaScript.NoAMD.Chutzpah/chutzpah.json b/JavaScript.NoAMD.Chutzpah/chutzpah.json
@@ -1,7 +1,4 @@
 {
    "Framework": "jasmine",
-   "TestHarnessReferenceMode": "Normal",
-   "References" : [
-      { "Path": "FrontEndTools.WebUI/lib/knockout.js" }
-    ]
+   "TestHarnessReferenceMode": "Normal"
 }
diff --git a/JavaScript.NoAMD.Chutzpah/readme.txt b/JavaScript.NoAMD.Chutzpah/readme.txt
@@ -0,0 +1,3 @@
+Readme:
+-----------------------
+* Set "JavaScript" mode in Chutzpah Visual Studio AddIn and restart Visual Studio
diff --git a/...Script.NoAMD.Karma/FrontEndTools.WebUI.Scripts.Test/Tests/Services/ColorCalculatorTest.js b/...Script.NoAMD.Karma/FrontEndTools.WebUI.Scripts.Test/Tests/Services/ColorCalculatorTest.js
@@ -1,5 +1,5 @@
-///<reference path="/../FrontEndTools.WebUI/Services/ColorCalculator.js"/>
-///<reference path="/lib/jasmine/jasmine.js"/>
+///<reference path="../../../FrontEndTools.WebUI/Services/ColorCalculator.js"/>
+///<reference path="../../lib/jasmine/jasmine.js"/>
 
 //---------------------------------------------------------------------
 describe("ColorCalculator tests", function () {

diff --git a/...ipt.NoAMD.Karma/FrontEndTools.WebUI.Scripts.Test/Tests/ViewModel/ColorBoxViewModelTest.js b/...ipt.NoAMD.Karma/FrontEndTools.WebUI.Scripts.Test/Tests/ViewModel/ColorBoxViewModelTest.js
@@ -1,5 +1,5 @@
-///<reference path="/../FrontEndTools.WebUI/ViewModels/ColorBoxViewModel.js"/>
-///<reference path="/lib/jasmine/jasmine.js"/>
+///<reference path="../../../FrontEndTools.WebUI/ViewModels/ColorBoxViewModel.js"/>
+///<reference path="../../lib/jasmine/jasmine.js"/>
 
 //---------------------------------------------------------------------
 describe("ColorBoxViewModel tests", function () {

diff --git a/...ipt.AMD.Chutzpah/FrontEndTools.WebUI.Scripts.Test/FrontEndTools.WebUI.Scripts.Test.csproj b/...ipt.AMD.Chutzpah/FrontEndTools.WebUI.Scripts.Test/FrontEndTools.WebUI.Scripts.Test.csproj
@@ -41,6 +41,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Content Include="config.js" />
     <Content Include="lib\jasmine\jasmine.js" />
     <TypeScriptCompile Include="lib\jasmine\jasmine.d.ts" />
     <TypeScriptCompile Include="Tests\Services\ColorCalculatorTest.ts" />

diff --git a/TypeScript.AMD.Chutzpah/FrontEndTools.WebUI.Scripts.Test/config.js b/TypeScript.AMD.Chutzpah/FrontEndTools.WebUI.Scripts.Test/config.js
@@ -0,0 +1,7 @@
+requirejs.config({
+    paths: {
+        //because of TestHarnessLocationMode - SettingsFileAdjacent all references here are relative to
+        //chutzpah.json file location
+        'knockout': 'FrontEndTools.WebUI/lib/knockout'
+    }
+});
diff --git a/TypeScript.AMD.Chutzpah/chutzpah.json b/TypeScript.AMD.Chutzpah/chutzpah.json
@@ -1,11 +1,13 @@
 {
    "Framework": "jasmine",
+   "TestHarnessLocationMode": "SettingsFileAdjacent",
    "TestHarnessReferenceMode": "AMD",
    "TypeScriptModuleKind": "AMD",
    "References" : [
-      { "Path": "FrontEndTools.WebUI/lib/knockout.js" },
       { "Path": "FrontEndTools.WebUI/lib/require.js" },
-      { "Path": "FrontEndTools.WebUI", "IncludeInTestHarness": "false" },
-      { "Path": "FrontEndTools.WebUI.Scripts.Test", "IncludeInTestHarness": "false" },
+	  { "Path": "FrontEndTools.WebUI.Scripts.Test/config.js" },
+	  { "Path": "FrontEndTools.WebUI/lib", "Include": "*.js", "IncludeInTestHarness": "false" },
+      { "Path": "FrontEndTools.WebUI/", "Include": "*.ts", "IncludeInTestHarness": "false" },
+      { "Path": "FrontEndTools.WebUI.Scripts.Test", "Include": "*.ts", "IncludeInTestHarness": "false" },
     ]
 }
diff --git a/TypeScript.NoAMD.Chutzpah/FrontEndTools.sln b/TypeScript.NoAMD.Chutzpah/FrontEndTools.sln
@@ -1,10 +1,17 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FrontEndTools.WebUI", "FrontEndTools.WebUI\FrontEndTools.WebUI.csproj", "{C0369B2C-3BF5-4B01-904D-F217627625DC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FrontEndTools.WebUI.Scripts.Test", "FrontEndTools.WebUI.Scripts.Test\FrontEndTools.WebUI.Scripts.Test.csproj", "{C640283C-1C51-40ED-8F01-319CCEE189D6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{D06BA799-762D-4C90-9900-BED2399CE67D}"
+	ProjectSection(SolutionItems) = preProject
+		chutzpah.json = chutzpah.json
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/TypeScript.NoAMD.Chutzpah/Screenshot.png b/TypeScript.NoAMD.Chutzpah/Screenshot.png
diff --git a/TypeScript.NoAMD.Chutzpah/readme.txt b/TypeScript.NoAMD.Chutzpah/readme.txt
@@ -0,0 +1,3 @@
+Readme:
+-----------------------
+* Set "TypeScript" mode in Chutzpah Visual Studio AddIn and restart Visual Studio