Skip to content

Commit

Permalink
update engine path in tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
nantas committed Dec 6, 2015
1 parent 452a4ea commit db8b4ac
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
5 changes: 2 additions & 3 deletions README.mdown
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ Running the tests (version <3)
------------------

```shell
$ git clone git://github.com/cocos2d/cocos2d-html5.git
$ cd cocos2d-html5
$ git submodule update --init
$ git clone git://github.com/fireball-x/engine.git
$ cd engine
$ python -m SimpleHTTPServer
```
... and then open a browser and go to `http://localhost:8000/tests`
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "cocos2d-html5",
"name": "fireball-engine",
"version": "3.9.0",
"description": "Cocos2d-html5 is a cross-platform 2D game engine written in Javascript, based on Cocos2d-X and licensed under MIT. It incorporates the same high level api as “Cocos2d JS-binding engine” and compatible with Cocos2d-X. It currently supports canvas and WebGL renderering.",
"homepage": "http://www.cocos2d-x.org",
Expand Down
2 changes: 1 addition & 1 deletion test/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ describe('core level', function () {
});

Editor.require( 'app://builtin/fire-assets/init' );
Editor.require( 'app://cocos2d/cocos2d-html5' );
Editor.require( 'app://engine' );
});
});
4 changes: 2 additions & 2 deletions test/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
</script>

<!-- cocos html5 -->
<script type="text/javascript" src="app://cocos2d/cocos2d-html5/bin/cocos2d-js.js"></script>
<script type="text/javascript" src="app://engine/bin/cocos2d-js.js"></script>
</head>

<body>
<h1>Testing Cocos2d-JS</h1>
<canvas id="gameCanvas" width="400" height="400"></canvas>

<script type="text/javascript" src="app://cocos2d/cocos2d-html5/test/page/index.js"></script>
<script type="text/javascript" src="app://engine/test/page/index.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion test/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ describe('test cocos', function () {
'show': true,
'resizable': false,
});
win.load('app://cocos2d/cocos2d-html5/test/page.html');
win.load('app://engine/test/page.html');
});
});
2 changes: 1 addition & 1 deletion test/page/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Editor.inspectors = {};
Editor.require('app://builtin/fire-assets/init');

// cocos
Editor.require('app://cocos2d/cocos2d-html5');
Editor.require('app://engine');

// init asset library
cc.AssetLibrary.init( Path.resolve(Path.join(__dirname, 'fixtures/library')) );
Expand Down

0 comments on commit db8b4ac

Please sign in to comment.