update screenshots and small fixes

basisjs · Feb 1, 2015 · dffee3b · dffee3b
1 parent 93538e6
commit dffee3b
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 23 deletions.
diff --git a/docs/img/example.png b/docs/img/example.png
diff --git a/docs/img/exception.png b/docs/img/exception.png
diff --git a/docs/img/showcase.png b/docs/img/showcase.png
diff --git a/example/non_basis_setup/env.html b/example/non_basis_setup/env.html
@@ -3,11 +3,10 @@
 
 <head>
   <meta charset="utf-8">
-  <title>basis.js base environment</title>
+  <title>base environment</title>
 </head>
 
 <body>
-  <script src="../src/basis.js" data-basis-config=""></script>
 </body>
 
-</html>
+</html>
diff --git a/example/non_basis_setup/index.html b/example/non_basis_setup/index.html
@@ -7,7 +7,6 @@
 </head>
 
 <body>
-  <script src="path/to/src/basis.js" basis-config></script>
   <script>
     if (this.top === this)
       location.href = 'runner/reporter.html?page=../index.html'; // page parameter value should contain relative path
@@ -35,4 +34,4 @@
   </script>
 </body>
 
-</html>
+</html>
diff --git a/example/showcase.html b/example/showcase.html
@@ -21,28 +21,32 @@
     }
   </style>
 
-  <!--<link rel="stylesheet" href="../build/style.css">
-  <script src="../build/basis.js"></script>-->
   <script src="../bower_components/basisjs/src/basis.js" data-basis-config="
-    autoload: '../src/reporter/app',
+    noConflict: true,
+    exports: true,
     modules: {
-      core: '../src/',
       esprima: '../bower_components/esprima/',
-      diff: '../bower_components/jsdiff/'
-    },
-    exports: true
+      diff: '../bower_components/jsdiff/',
+      runner: {
+        path: '../src/runner',
+        filename: './index.js'
+      },
+      app: {
+        autoload: true,
+        path: '../src/app',
+        filename: './index.js'
+      }
+    }
   "></script>
 </head>
 
 <body>
-  <div id="test-runner" style="border: 1px solid black; margin: 10px;">
-  </div>
+  <div id="test-runner"></div>
   <script>
-    basisjsTestRunner.setup({
-      element: document.getElementById('test-runner'),
-      baseURI: '../build/'
+    yatra.setup({
+      element: document.getElementById('test-runner')
     });
-    basisjsTestRunner.loadTests({
+    yatra.loadTests({
       name: 'Showcase',
       test: [
         {
@@ -87,8 +91,8 @@
                   }
                 );
 
-                var foo = function(){ return assert(1, 1) };
-                assert(function(){ return assert(1, 1) }, foo);
+                var foo = function(){ return assert(1, 1); };
+                assert(function(){ return assert(1, 1); }, foo);
 
                 // function bar(){ return assert(1, 1); };
                 // assert(function bar(){ return assert(1, 1); }, bar);
@@ -97,7 +101,7 @@
             {
               name: 'Failures',
               test: function(){
-                assert(true, false)
+                assert(true, false);
                 assert({ a: 1, b: 2 }, { a: 1, c: 2 });
                 assert([{ a: 1 }], [{ a: 1 }]);
                 assert([1, 2], [2, 3]);
@@ -323,7 +327,7 @@
         }
       ]
     });
-    basisjsTestRunner.run();
+    yatra.run();
   </script>
 </body>
 </html>
diff --git a/src/runner/build.js b/src/runner/build.js
@@ -1,7 +1,7 @@
 // This module uses for runner build.
 
 // Export runner to global scrope
-global.runner = require('runner');
+global.yatra = require('runner');
 
 // Try resolve base path to runner static files.
 runner.setup({