Skip to content

Commit

Permalink
Merge pull request #467 from johanneswuerbach/updated-dependencies
Browse files Browse the repository at this point in the history
Bumped dependencies
  • Loading branch information
johanneswuerbach committed Jan 22, 2015
2 parents 8c24b1c + 4ad159a commit d30d251
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 33 deletions.
38 changes: 19 additions & 19 deletions package.json
Expand Up @@ -21,27 +21,27 @@
],
"license": "MIT",
"dependencies": {
"async": "~0.2.7",
"backbone": "~1.0.0",
"charm": "~0.0.5",
"colors": "~0.6.0",
"commander": "*",
"consolidate": "~0.8.0",
"did_it_work": "~0.0.5",
"async": "^0.9.0",
"backbone": "^1.1.2",
"charm": "^1.0.0",
"colors": "^1.0.3",
"commander": "^2.6.0",
"consolidate": "^0.10.0",
"did_it_work": "0.0.6",
"express": "^4.10.7",
"fileset": "~0.1.4",
"fireworm": "~0.6.0",
"glob": "~3.1.21",
"growl": "~1.7.0",
"http-proxy": "~0.10.2",
"js-yaml": "~2.1.0",
"mustache": "~0.4.0",
"npmlog": "~0.0.6",
"rimraf": "~2.2.0",
"fileset": "^0.1.5",
"fireworm": "^0.6.6",
"glob": "^4.3.5",
"growl": "^1.8.1",
"http-proxy": "^1.8.1",
"js-yaml": "^3.2.5",
"mustache": "^1.0.0",
"npmlog": "^1.0.0",
"rimraf": "^2.2.8",
"socket.io": "~1.3.2",
"styled_string": "*",
"tap": "~0.4.4",
"xml-escape": "~1.0.0"
"styled_string": "0.0.1",
"tap": "^0.5.0",
"xml-escape": "^1.0.0"
},
"files": [
"lib",
Expand Down
7 changes: 4 additions & 3 deletions tests/server_tests.js
Expand Up @@ -88,9 +88,10 @@ describe('Server', function(){
'<!doctype html>'
, '<html>'
, '<head>'
, ' <script src="web/hello.js"></script>'
, ' <script src="web/hello_tst.js" data-foo="true" data-bar ></script>'
, ' </head>'
, ' <script src="web/hello.js"></script>'
, ' <script src="web/hello_tst.js" data-foo="true" data-bar></script>'
, '</head>'
, ''
].join('\n'))
done()
})
Expand Down
4 changes: 2 additions & 2 deletions tests/web/tests_template.mustache
Expand Up @@ -2,6 +2,6 @@
<html>
<head>
{{#serve_files}}
<script src="{{src}}"{{#attrs}} {{&.}} {{/attrs}}></script>
<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>
{{/serve_files}}
</head>
</head>
4 changes: 2 additions & 2 deletions views/busterrunner.mustache
Expand Up @@ -6,7 +6,7 @@
{{#styles}}<link rel="stylesheet" href="{{.}}">{{/styles}}
<script src="/testem/buster-test.js"></script>
<script src="/testem.js"></script>
{{#scripts}}<script src="{{src}}"{{#attrs}} {{&.}} {{/attrs}}></script>{{/scripts}}
{{#scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/scripts}}
</head>
<body></body>
</html>
</html>
2 changes: 1 addition & 1 deletion views/customrunner.mustache
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Test'em</title>
<script src="/testem.js"></script>
{{#scripts}}<script src="{{src}}"{{#attrs}} {{&.}} {{/attrs}}></script>{{/scripts}}
{{#scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/scripts}}
</head>
<body>
</body>
Expand Down
2 changes: 1 addition & 1 deletion views/jasmine2runner.mustache
Expand Up @@ -7,7 +7,7 @@
<script src="/testem/jasmine2-boot.js"></script>
<script src="/testem.js"></script>

{{#scripts}}<script src="{{src}}"{{#attrs}} {{&.}} {{/attrs}}></script>{{/scripts}}
{{#scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/scripts}}

<link rel="stylesheet" href="/testem/jasmine2.css">

Expand Down
2 changes: 1 addition & 1 deletion views/jasminerunner.mustache
Expand Up @@ -16,7 +16,7 @@
})();
</script>

{{#scripts}}<script src="{{src}}"{{#attrs}} {{&.}} {{/attrs}}></script>{{/scripts}}
{{#scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/scripts}}

<link rel="stylesheet" href="/testem/jasmine.css">

Expand Down
2 changes: 1 addition & 1 deletion views/mochachairunner.mustache
Expand Up @@ -7,7 +7,7 @@
<script src="/testem/chai.js"></script>
<script src="/testem.js"></script>
<script>mocha.setup('bdd')</script>
{{#scripts}}<script src="{{src}}"{{#attrs}} {{&.}} {{/attrs}}></script>{{/scripts}}
{{#scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/scripts}}
</head>
<body>
<div id="mocha"></div>
Expand Down
2 changes: 1 addition & 1 deletion views/mocharunner.mustache
Expand Up @@ -6,7 +6,7 @@
<script src="/testem/mocha.js"></script>
<script src="/testem.js"></script>
<script>mocha.setup('bdd')</script>
{{#scripts}}<script src="{{src}}"{{#attrs}} {{&.}} {{/attrs}}></script>{{/scripts}}
{{#scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/scripts}}
{{#styles}}<link rel="stylesheet" href="{{.}}">{{/styles}}
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion views/qunitrunner.mustache
Expand Up @@ -4,7 +4,7 @@
<title>Test'em</title>
<script src="/testem/qunit.js"></script>
<script src="/testem.js"></script>
{{#scripts}}<script src="{{src}}"{{#attrs}} {{&.}} {{/attrs}}></script>{{/scripts}}
{{#scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/scripts}}
<link rel="stylesheet" href="/testem/qunit.css"/>
{{#styles}}<link rel="stylesheet" href="{{.}}">{{/styles}}
</head>
Expand Down
2 changes: 1 addition & 1 deletion views/taprunner.mustache
Expand Up @@ -15,6 +15,6 @@ Testem.handleConsoleMessage = function(msg){
return false
}
</script>
{{#scripts}}<script src="{{src}}"{{#attrs}} {{&.}} {{/attrs}}></script>{{/scripts}}
{{#scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/scripts}}
</body>
</html>

0 comments on commit d30d251

Please sign in to comment.