Skip to content

Commit

Permalink
gets the tests running again afte the aurelia update and minor fixes …
Browse files Browse the repository at this point in the history
…to the customElement
  • Loading branch information
michaelmalonenz committed Mar 15, 2016
1 parent 68a5830 commit c2dca09
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build/tasks/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var argv = require('yargs')
/**
* Add the files to test, always beginning with the source files!
*/
var filesToLoad = ['src/**/*.js', 'test/unit/initialize.spec.js', 'test/unit/lib/*.js'];
var filesToLoad = ['test/unit/initialize.js', 'src/**/*.js', 'test/unit/lib/*.js'];
filesToLoad.push(path.join('test/unit/**', argv.t));

/**
Expand Down
5 changes: 5 additions & 0 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ System.config({
},

map: {
"aurelia-binding": "npm:[email protected]",
"aurelia-dependency-injection": "npm:[email protected]",
"aurelia-pal-browser": "npm:[email protected]",
"aurelia-polyfills": "npm:[email protected]",
"aurelia-templating": "npm:[email protected]",
"babel": "npm:[email protected]",
"babel-runtime": "npm:[email protected]",
Expand Down Expand Up @@ -58,6 +60,9 @@ System.config({
"npm:[email protected]": {
"aurelia-pal": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-pal": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-pal": "npm:[email protected]"
},
Expand Down
2 changes: 2 additions & 0 deletions dist/system/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ System.register(['./options', './dragula'], function (_export) {
if (callback !== undefined && typeof callback === 'function') {
callback(defaults);
}

config.globalResources(['./dragula-and-drop']);
}

return {
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = function(config) {

jspm: {
// Edit this to your needs
loadFiles: ['src/**/*.js', 'test/unit/**/*.js']
loadFiles: ['test/unit/initialize.js', 'src/**/*.js', 'test/unit/**/*.js']
},


Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"url": "git+ssh://[email protected]/michaelmalonenz/aurelia-dragula.git"
},
"devDependencies": {
"aurelia-polyfills": "^0.1.2",
"aurelia-tools": "^0.1.18",
"babel-eslint": "^4.1.8",
"conventional-changelog": "0.0.11",
Expand Down Expand Up @@ -52,11 +53,13 @@
"dist": "dist/amd"
},
"dependencies": {
"aurelia-dependency-injection": "^1.0.0-beta.1.1.3",
"aurelia-binding": "^1.0.0-beta.1.2.2",
"aurelia-dependency-injection": "^1.0.0-beta.1.1.5",
"aurelia-pal-browser": "^1.0.0-beta.1.1.3",
"aurelia-templating": "^1.0.0-beta.1.1.4"
},
"devDependencies": {
"aurelia-polyfills": "^1.0.0-beta.1.0.6",
"babel": "babel-core@^5.8.24",
"babel-runtime": "^5.8.24",
"core-js": "^2.1.0"
Expand Down
7 changes: 4 additions & 3 deletions src/dragula-and-drop.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {customElement, bindable} from 'aurelia-templating';
import {customElement, bindable, noView} from 'aurelia-templating';
import {bindingMode} from 'aurelia-binding';
import {inject} from 'aurelia-dependency-injection';

Expand All @@ -12,13 +12,14 @@ import {Dragula} from './dragula';
@bindable({ name: 'isContainer', attribute: 'is-container', defaultBindingMode: bindingMode.oneTime })
@bindable({ name: 'copy', defaultBindingMode: bindingMode.oneTime })
@bindable({ name: 'copySortSource', defaultBindingMode: bindingMode.oneTime })
@bindable({ name: 'revertOnSpill', defaultBindingMode: bindingMode.oneTime })
@bindable({ name: 'removeOnSpill', defaultBindingMode: bindingMode.oneTime })
@bindable({ name: 'revertOnSpill', attribute: 'revert-on-spill', defaultBindingMode: bindingMode.oneTime })
@bindable({ name: 'removeOnSpill', attribute: 'remove-on-spill', defaultBindingMode: bindingMode.oneTime })
@bindable({ name: 'direction', defaultBindingMode: bindingMode.oneTime })
@bindable({ name: 'ignoreInputTextSelection', attribute: 'ingore-input-text-selection', defaultBindingMode: bindingMode.oneTime })
@bindable({ name: 'mirrorContainer', attribute: 'mirror-container', defaultBindingMode: bindingMode.oneTime })
@customElement('dragula-and-drop')
@inject(GLOBAL_OPTIONS)
@noView()
export class DragulaAndDrop {

constructor(globalOptions) {
Expand Down
2 changes: 2 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ export function configure(config, callback) {
if (callback !== undefined && typeof(callback) === 'function') {
callback(defaults);
}

config.globalResources(['./dragula-and-drop']);
}
1 change: 1 addition & 0 deletions test/unit/initialize.spec.js → test/unit/initialize.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'aurelia-polyfills';
import {initialize} from 'aurelia-pal-browser';

initialize();

0 comments on commit c2dca09

Please sign in to comment.