Skip to content
This repository has been archived by the owner on Mar 2, 2018. It is now read-only.

Commit

Permalink
nodejs 0.12 & jasmine-2.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
tmtk75 committed Jul 20, 2015
1 parent 6f370ac commit 27ae98b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
nvm use 0.10
nvm use 0.12
PATH=$PATH:`pwd`/node_modules/.bin
PATH=$PATH:`pwd`/node_modules/karma/bin
export CHROME_BIN="/opt/homebrew-cask/Caskroom/google-chrome/latest/Google Chrome.app/Contents/MacOS/Google Chrome" \
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ vendor/coffee-script.js:
node_modules/jquery/dist/jquery.js:
npm install

vendor/jasmine/lib/jasmine-2.1.3/jasmine.js:
vendor/jasmine/lib/jasmine-2.3.4/jasmine.js:
mkdir -p vendor/jasmine && cd vendor/jasmine; \
curl -OL 'https://raw.githubusercontent.com/jasmine/jasmine/master/dist/jasmine-standalone-2.1.3.zip'; \
unzip -o jasmine-standalone-2.1.3.zip; \
touch lib/jasmine-2.1.3/jasmine.js
curl -OL 'https://github.com/jasmine/jasmine/releases/download/v3.3.4/jasmine-standalone-2.3.4.zip'; \
unzip -o jasmine-standalone-2.3.4.zip; \
touch lib/jasmine-2.3.4/jasmine.js

.PHONY: test example karma api clean
test: dist/bundle.lib.js dist/bundle.spec.js \
vendor/coffee-script.js \
vendor/jasmine/lib/jasmine-2.1.3/jasmine.js
vendor/jasmine/lib/jasmine-2.3.4/jasmine.js
open spec/index.html

example: dist/bundle.lib.js
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"grunt-contrib-stylus": "^0.20.0",
"grunt-contrib-uglify": "^0.6.0",
"jasmine": "^2.1.1",
"jasmine-core": "^2.1.3",
"jasmine-core": "^2.3.4",
"jasmine-node": "^1.14.5",
"karma": "^0.12.28",
"karma-chrome-launcher": "^0.1.7",
Expand Down
8 changes: 4 additions & 4 deletions spec/index.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<html>
<head>
<meta charset='utf-8'>
<link rel="stylesheet" href="../vendor/jasmine/lib/jasmine-2.1.3/jasmine.css">
<link rel="stylesheet" href="../vendor/jasmine/lib/jasmine-2.3.4/jasmine.css">
<link rel="stylesheet" href="./jasmine-utils.css">
</head>
<body></body>
<script src="../node_modules/jquery/dist/jquery.min.js" type="text/javascript"></script>
<script src="../vendor/coffee-script.js" type="text/javascript"></script>
<script src="../vendor/jasmine/lib/jasmine-2.1.3/jasmine.js" type="text/javascript"></script>
<script src="../vendor/jasmine/lib/jasmine-2.1.3/jasmine-html.js" type="text/javascript"></script>
<script src="../vendor/jasmine/lib/jasmine-2.1.3/boot.js" type="text/javascript"></script>
<script src="../vendor/jasmine/lib/jasmine-2.3.4/jasmine.js" type="text/javascript"></script>
<script src="../vendor/jasmine/lib/jasmine-2.3.4/jasmine-html.js" type="text/javascript"></script>
<script src="../vendor/jasmine/lib/jasmine-2.3.4/boot.js" type="text/javascript"></script>
<script src="../dist/bundle.lib.js" type="text/javascript"></script>
<script src="../dist/bundle.spec.js" type="text/javascript"></script>

Expand Down

0 comments on commit 27ae98b

Please sign in to comment.