From 976859632fcd277ea72471b17b3631ca7cc63e1c Mon Sep 17 00:00:00 2001
From: Michel Felipe <mfelipeof@gmail.com>
Date: Tue, 5 May 2015 15:47:47 -0300
Subject: [PATCH] Refactor html jasmine runner to include requirejs-config.js paths mapper

---
 test/SpecRunner.html  | 126 ++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------
 test/spec/MainSpec.js |   3 +--
 2 files changed, 45 insertions(+), 84 deletions(-)

diff --git a/test/SpecRunner.html b/test/SpecRunner.html
index ad89373..e9797fd 100644
--- a/test/SpecRunner.html
+++ b/test/SpecRunner.html
@@ -7,97 +7,59 @@
   <link rel="shortcut icon" type="image/png" href="lib/jasmine-2.2.0/jasmine_favicon.png">
   <link rel="stylesheet" href="lib/jasmine-2.2.0/jasmine.css">
 
-  <!-- // <script src="lib/jasmine-2.2.0/jasmine.js"></script>
-  // <script src="lib/jasmine-2.2.0/jasmine-html.js"></script> -->
-  <!-- // <script src="lib/jasmine-2.2.0/boot.js"></script> -->
-
-  <script type="text/javascript">
-
-        var require = {
-            paths: {
-                "domReady": "lib/requirejs-plugins/domReady",
-                "model": "../js",
-                "handlebars": '../js/handlebars-v3.0.1',
-                "handlebars_helpers": '../js/handlebars-helpers',
-                "jquery":'../js/jquery-2.1.3.min',
-                "jquery_cookie":'../js/jquery.cookie',
-                "jasmine":'lib/jasmine-2.2.0/jasmine',
-                "jasmine-html":'lib/jasmine-2.2.0/jasmine-html',
-                "jasmine-jquery":'lib/jasmine-plugins/jasmine-jquery',
-                "jasmine-boot":'lib/jasmine-2.2.0/boot'
-            },
-            shim:{
-              jasmine:{
-                exports: 'jasmine'
-              },
-              'jasmine-html':{
-                deps:['jasmine'],
-                exports: 'jasmine'
-              },
-              'jasmine-boot':{
-                deps:['jasmine-html','jasmine'],
-                exports:'jasmine'
-              }
-            }
-        };
-
-    </script>
-
-  <script src="../js/require.js"></script>
-
-  <!-- // <script src="../js/handlebars-v3.0.1.js"></script> -->
-  <!-- // <script src="../js/handlebars-helpers.js"></script> -->
-
   <!-- include source files here... -->
-  <!-- <script src="../js/main.js"></script> -->
+  <script src="../js/require.js"></script>
 
-  <!-- include spec files here... -->
+  <!-- include spec files here...if you not use require.js library -->
 
   <script type="text/javascript">
 
-        require(
-            [
-                "domReady!",
-                "spec/MainSpec"
-            ],
-            function( jasmine ){
-
-              // window.jasmine = jasmineRequire.core(jasmineRequire);
-              //
-              // jasmineRequire.html(jasmine);
-              //
-              // var jasmineEnv = jasmine.getEnv();
-              // jasmineEnv.updateInterval = 1000;
-              //
-              // var htmlReporter = new jasmine.HtmlReporter();
-              //
-              // jasmineEnv.addReporter(htmlReporter);
-              //
-              // jasmineEnv.specFilter = function (spec) {
-              //     return htmlReporter.specFilter(spec);
-              // };
-
-
-                // Set up the HTML reporter - this is reponsible for
-                // aggregating the results reported by Jasmine as the
-                // tests and suites are executed.
-                // jasmine.getEnv().addReporter(
-                //     new jasmine.HtmlReporter()
-                // );
-                //
-                // // Run all the loaded test specs.
-                // jasmine.getEnv().execute();
-                if(typeof window.onload == 'function'){
-                  window.onload();
+        require(['../js/requirejs-config'],function(){
+
+            require.config({
+                paths: {
+                    "jasmine": test+'/lib/jasmine-2.2.0/jasmine',
+                    "jasmine-html": test+'/lib/jasmine-2.2.0/jasmine-html',
+                    "jasmine-jquery": test+'/lib/jasmine-plugins/jasmine-jquery',
+                    "jasmine-boot": test+'/lib/jasmine-2.2.0/boot',
+                    "domReady": test+'/lib/requirejs-plugins/domReady'
+                },
+                shim:{
+                  jasmine:{
+                    exports: 'jasmine'
+                  },
+                  'jasmine-html':{
+                    deps:['jasmine'],
+                    exports: 'jasmine'
+                  },
+                  'jasmine-boot':{
+                    deps:['jasmine-html','jasmine'],
+                    exports:'jasmine'
+                  }
+                }
+            });
+
+            require(
+                [
+                    "domReady!",
+                    "./spec/MainSpec.js"
+                ],
+                function(){
+
+                    /* Run all the loaded test specs.
+                    *
+                    *  @see boot.js file that contains a jasmine.getEnv().execute()
+                    *       function added to window.onload event
+                    */
+                    if(typeof window.onload == 'function'){
+                      window.onload();
+                    }
                 }
-            }
-        );
+            );
+        });
 
     </script>
 
-
-  <!-- // <script src="spec/MainSpec.js"></script> -->
-
 </head>
 
 <body>
diff --git a/test/spec/MainSpec.js b/test/spec/MainSpec.js
index bf372ca..fecec1a 100644
--- a/test/spec/MainSpec.js
+++ b/test/spec/MainSpec.js
@@ -1,4 +1,4 @@
-define(['jasmine-boot', 'model/proposal-app'],function(jasmine, ProposalApp){
+define(['jasmine-boot', 'proposal_app'],function(jasmine, ProposalApp){
 
   describe("Limit proposal voting to one per browser", function(){
     it("Should register a proposal id", function(){
@@ -12,5 +12,4 @@ define(['jasmine-boot', 'model/proposal-app'],function(jasmine, ProposalApp){
 
   });
 
-
 });
--
libgit2 0.21.2