Skip to content

Commit

Permalink
chore: rename to Karma
Browse files Browse the repository at this point in the history
  • Loading branch information
vojtajina committed Mar 19, 2013
1 parent 4087ac7 commit 48cad2e
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ test
tasks

Gruntfile.coffee
testacular.conf.js
karma.conf.js
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Please see the [Contributing to Testacular] guide for information on contributing to this project.
Please see the [Contributing to Karma] guide for information on contributing to this project.

[Contributing to Testacular]: https://github.com/testacular/testacular/blob/master/CONTRIBUTING.md
[Contributing to Karma]: https://github.com/karma-runner/karma/blob/master/CONTRIBUTING.md
10 changes: 5 additions & 5 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ module.exports = (grunt) ->
boss: true
globals: {}

testacular:
karma:
adapter:
configFile: 'testacular.conf.js'
configFile: 'karma.conf.js'
autoWatch: false
singleRun: true
reporters: ['dots']

grunt.loadTasks 'tasks'
# grunt.loadTasks '../testacular/tasks'
# grunt.loadTasks '../karma/tasks'
grunt.loadNpmTasks 'grunt-contrib-jshint'
grunt.loadNpmTasks 'gruntacular'
grunt.loadNpmTasks 'grunt-karma'

grunt.registerTask 'default', ['build', 'jshint', 'test']
grunt.registerTask 'test', ['testacular']
grunt.registerTask 'test', ['karma']

# TODO(vojta): release task
# grunt.registerTask 'release', 'Build, bump and publish to NPM.', (type) ->
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# testacular-requirejs
# karma-requirejs

> Adapter for the RequireJS framework.
For more information on Testacular see the [homepage].
For more information on Karma see the [homepage].


[homepage]: http://testacular.github.com
[homepage]: http://karma-runner.github.com
6 changes: 3 additions & 3 deletions testacular.conf.js → karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ files = [
browsers = process.env.TRAVIS ? ['Firefox'] : ['Chrome'];

plugins = [
'testacular-jasmine',
'testacular-chrome-launcher',
'testacular-firefox-launcher'
'karma-jasmine',
'karma-chrome-launcher',
'karma-firefox-launcher'
];

autoWatch = true;
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "testacular-requirejs",
"name": "karma-requirejs",
"version": "0.0.1",
"description": "A Testacular plugin. Adapter for RequireJS framework.",
"description": "A Karma plugin. Adapter for RequireJS framework.",
"main": "lib/index.js",
"scripts": {
"test": "grunt test"
},
"repository": {
"type": "git",
"url": "git://github.com/testacular/testacular-requirejs.git"
"url": "git://github.com/karma-runner/karma-requirejs.git"
},
"keywords": [
"testacular-plugin",
"karma-plugin",
"adapter",
"requirejs"
],
Expand All @@ -21,12 +21,12 @@
"devDependencies": {
"grunt": "~0.4.0rc5",
"grunt-contrib-jshint": "~0.1.1rc5",
"testacular": "*",
"testacular-jasmine": "*",
"gruntacular": "~0.1.0"
"karma": "*",
"karma-jasmine": "*",
"grunt-karma": "~0.3"
},
"peerDependencies": {
"testacular": "~0.7"
"karma": "~0.9"
},
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/adapter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// monkey patch requirejs, to use append timestamps to sources
// to take advantage of testacular's heavy caching
// to take advantage of karma's heavy caching
// it would work even without this hack, but with reloading all the files all the time

var normalizePath = function(path) {
Expand Down
8 changes: 4 additions & 4 deletions src/adapter.wrapper
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
(function(testacular, requirejs) {
(function(karma, requirejs) {

%CONTENT%

// make it async
testacular.loaded = function() {};
karma.loaded = function() {};

// patch require.js
requirejs.load = createPatchedLoad(testacular.files, requirejs.load);
requirejs.load = createPatchedLoad(karma.files, requirejs.load);

})(window.__testacular__, window.requirejs);
})(window.__karma__, window.requirejs);

0 comments on commit 48cad2e

Please sign in to comment.