fix tests

This commit is contained in:
Keegan
2016-02-09 17:34:49 -08:00
parent f7add16622
commit 2142c68c01
6 changed files with 10 additions and 97 deletions
+2
View File
@@ -25,3 +25,5 @@ build/Release
# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules
tmp
+2 -2
View File
File diff suppressed because one or more lines are too long
+5 -5
View File
@@ -8,11 +8,11 @@ var ClayConfig = require('../src/scripts/lib/clay-config');
var idCounter = 0;
// add some components to the registry to test
ClayConfig.registerComponent(require('pebble-clay-components').text);
ClayConfig.registerComponent(require('pebble-clay-components').input);
ClayConfig.registerComponent(require('pebble-clay-components').toggle);
ClayConfig.registerComponent(require('pebble-clay-components').footer);
ClayConfig.registerComponent(require('pebble-clay-components').select);
ClayConfig.registerComponent(require('../src/scripts/components/text'));
ClayConfig.registerComponent(require('../src/scripts/components/input'));
ClayConfig.registerComponent(require('../src/scripts/components/toggle'));
ClayConfig.registerComponent(require('../src/scripts/components/footer'));
ClayConfig.registerComponent(require('../src/scripts/components/select'));
/**
* @param {string|{}} config
-87
View File
@@ -1,87 +0,0 @@
'use strict';
// Karma configuration
// Generated on Mon Jan 25 2016 15:19:28 GMT-0800 (PST)
module.exports = function(config) {
config.set({
// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '..',
// frameworks to use
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
frameworks: ['browserify', 'mocha'],
browserify: {
debug: true,
plugin: [
[
'sourcemapify',
{ root: '/Users/keegan/eclipse_workspace/pebble-clay' }
]
],
transform: [
[
'stringify',
{ extensions: ['.html', '.tpl'] }
],
'deamdify'
]
},
// list of files / patterns to load in the browser
files: [
'test/spec/**/*.js'
],
// list of files to exclude
exclude: [],
// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {
'test/spec/**/*.js': ['browserify']
},
// Which plugins to enable
plugins: [
'karma-chrome-launcher',
'karma-mocha',
'karma-mocha-reporter',
'karma-browserify'
],
// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ['progress', 'mocha'],
// web server port
port: 9877,
// enable / disable colors in the output (reporters and logs)
colors: true,
// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN
// || config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_INFO,
// enable / disable watching file and executing tests whenever any file changes
autoWatch: true,
// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: ['Chrome'],
// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: true,
// Concurrency level
// how many browser should be started simultaneous
concurrency: Infinity
});
};
-2
View File
@@ -18,7 +18,6 @@ module.exports = function(config) {
[
'stringify',
{
global: true,
extensions: ['.html', '.tpl']
}
],
@@ -26,7 +25,6 @@ module.exports = function(config) {
[
'sassify',
{
global: true,
base64Encode: false,
sourceMap: false,
sourceMapEmbed: false,
+1 -1
View File
@@ -2,7 +2,7 @@
var assert = require('chai').assert;
var _ = require('../../../src/scripts/vendor/minified')._;
var selectComponent = require('pebble-clay-components').select;
var selectComponent = require('../../../src/scripts/components/select');
var componentRegistry = require('../../../src/scripts/lib/component-registry');
var checkReadOnly = require('../../test-utils').checkReadOnly;
var fixtures = require('../../fixture');