Skip to content

Commit

Permalink
add the new record panel template context processor
Browse files Browse the repository at this point in the history
  • Loading branch information
fredkingham committed Mar 31, 2016
1 parent ff7b342 commit 908caa0
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 68 deletions.
137 changes: 69 additions & 68 deletions config/karma.conf.travis.js
Original file line number Diff line number Diff line change
@@ -1,81 +1,82 @@
module.exports = function(config){
var browsers, basePath;
var browsers, basePath;

if(process.env.TRAVIS){
browsers = ["Firefox"];
basePath = '/home/travis/virtualenv/python2.7/src/opal/opal/static/js';
}
else{
browsers = ['PhantomJS'];
basePath = '../../opal/opal/static/js';
}
if(process.env.TRAVIS){
browsers = ["Firefox"];
basePath = '/home/travis/virtualenv/python2.7/src/opal/opal/static/js';
}
else{
browsers = ['PhantomJS'];
basePath = '../../opal/opal/static/js';
}

config.set({
frameworks: ['jasmine'],
browsers: browsers,
basePath: basePath,
files: [
//JASMINE,
//JASMINE_ADAPTER,
'angular-1.2.20/angular.js',
'angular-1.2.20/angular-route.js',
'angular-1.2.20/angular-resource.js',
'angular-1.2.20/angular-cookies.js',
'angular-1.2.20/angular-mocks.js',
'angular-ui-utils-0.1.0/ui-utils.js',
'angular-ui-bootstrap-0.10.0/ui-bootstrap-tpls.js',
config.set({
frameworks: ['jasmine'],
browsers: browsers,
basePath: basePath,

'angular-strap-2.0.3/modules/tooltip.js',
'angular-strap-2.0.3/modules/tooltip.tpl.js',
'angular-strap-2.0.3/modules/dimensions.js',
'angular-strap-2.0.3/modules/parse-options.js',
'angular-strap-2.0.3/modules/date-parser.js',
'angular-strap-2.0.3/modules/datepicker.js',
'angular-strap-2.0.3/modules/datepicker.tpl.js',
'angular-strap-2.0.3/modules/timepicker.js',
'angular-strap-2.0.3/modules/timepicker.tpl.js',
'angular-strap-2.0.3/modules/typeahead.js',
'angular-strap-2.0.3/modules/typeahead.tpl.js',
'ngprogress-lite/ngprogress-lite.js',
'jquery-1.11.0/jquery.js',
'utils/underscore.js',
'utils/moment.js',
'bower_components/angular-growl-v2/build/angular-growl.js',
'bower_components/ment.io/dist/mentio.js',
'bower_components/ment.io/dist/templates.js',
files: [
//JASMINE,
//JASMINE_ADAPTER,
'angular-1.2.20/angular.js',
'angular-1.2.20/angular-route.js',
'angular-1.2.20/angular-resource.js',
'angular-1.2.20/angular-cookies.js',
'angular-1.2.20/angular-mocks.js',
'angular-ui-utils-0.1.0/ui-utils.js',
'angular-ui-bootstrap-0.10.0/ui-bootstrap-tpls.js',

'opal/utils.js',
'opal/directives.js',
'opal/filters.js',
'opal/services_module.js',
'opal/services/*.js',
'opal/controllers_module.js',
'opal/controllers/*.js',
'opal/app.js',
'../../core/search/static/js/search/controllers/*',
'../../core/search/static/js/search/services/*',
'angular-strap-2.0.3/modules/tooltip.js',
'angular-strap-2.0.3/modules/tooltip.tpl.js',
'angular-strap-2.0.3/modules/dimensions.js',
'angular-strap-2.0.3/modules/parse-options.js',
'angular-strap-2.0.3/modules/date-parser.js',
'angular-strap-2.0.3/modules/datepicker.js',
'angular-strap-2.0.3/modules/datepicker.tpl.js',
'angular-strap-2.0.3/modules/timepicker.js',
'angular-strap-2.0.3/modules/timepicker.tpl.js',
'angular-strap-2.0.3/modules/typeahead.js',
'angular-strap-2.0.3/modules/typeahead.tpl.js',
'ngprogress-lite/ngprogress-lite.js',
'jquery-1.11.0/jquery.js',
'utils/underscore.js',
'utils/moment.js',
'bower_components/angular-growl-v2/build/angular-growl.js',
'bower_components/ment.io/dist/mentio.js',
'bower_components/ment.io/dist/templates.js',

__dirname + '/../elcid/assets/js/elcid/*.js',
__dirname + '/../elcid/assets/js/elcidtest/*.js',
],
'opal/utils.js',
'opal/directives.js',
'opal/filters.js',
'opal/services_module.js',
'opal/services/*.js',
'opal/controllers_module.js',
'opal/controllers/*.js',
'opal/app.js',
'../../core/search/static/js/search/controllers/*',
'../../core/search/static/js/search/services/*',

preprocessors: {
'**/opal/*.js': 'coverage'
},
__dirname + '/../elcid/assets/js/elcid/*.js',
__dirname + '/../elcid/assets/js/elcidtest/*.js',
],

reporters: ['progress', 'coverage'],
preprocessors: {
'**/opal/*.js': 'coverage'
},

autoWatch: true,
reporters: ['progress', 'coverage'],

coverageReporter: {
type : 'html',
dir : '../../../coverage-js/',
},
autoWatch: true,

// Stolen from http://oligofren.wordpress.com/2014/05/27/running-karma-tests-on-browserstack/
browserDisconnectTimeout : 10000, // default 2000
browserDisconnectTolerance : 1, // default 0
browserNoActivityTimeout : 4*60*1000, //default 10000
captureTimeout : 4*60*1000, //default 60000
coverageReporter: {
type : 'html',
dir : '../../../coverage-js/',
},

// Stolen from http://oligofren.wordpress.com/2014/05/27/running-karma-tests-on-browserstack/
browserDisconnectTimeout : 10000, // default 2000
browserDisconnectTolerance : 1, // default 0
browserNoActivityTimeout : 4*60*1000, //default 10000
captureTimeout : 4*60*1000, //default 60000
})
}
1 change: 1 addition & 0 deletions elcid/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
'django.core.context_processors.tz',
'django.contrib.messages.context_processors.messages',
'opal.context_processors.settings',
'opal.context_processors.models',
)

INSTALLED_APPS = (
Expand Down

0 comments on commit 908caa0

Please sign in to comment.