Skip to content

Commit 4a89deb

Browse files
committed
Tests now use the new bootstrap decorator
1 parent b8bb8af commit 4a89deb

File tree

8 files changed

+135
-355
lines changed

8 files changed

+135
-355
lines changed

bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"angular-mocks": ">= 1.2",
5353
"tx-tinymce": ">= 0.0.5",
5454
"angular-ui-sortable": ">=0.12.11",
55-
"bootstrap-vertical-tabs": "~1.2.0"
55+
"bootstrap-vertical-tabs": "~1.2.0",
56+
"angular-schema-form-bootstrap": "~0.1.1"
5657
}
5758
}

karma.conf.js

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ module.exports = function(config) {
2323
'src/sfPath.js',
2424
'src/services/*.js',
2525
'src/directives/*.js',
26-
'src/directives/decorators/bootstrap/*.js',
27-
'src/**/*.html',
26+
'bower_components/angular-schema-form-bootstrap/bootstrap-decorator.js',
2827
'test/services/schema-form-test.js',
2928
'test/services/decorators-test.js',
3029
'test/services/messages-test.js',
@@ -43,8 +42,7 @@ module.exports = function(config) {
4342
reporters: ['progress','coverage','growler'],
4443

4544
preprocessors: {
46-
'src/**/*.js': ['coverage'],
47-
'src/**/*.html': ['ng-html2js']
45+
'src/**/*.js': ['coverage']
4846
},
4947

5048
// optionally, configure the reporter
@@ -53,15 +51,6 @@ module.exports = function(config) {
5351
dir : 'coverage/'
5452
},
5553

56-
57-
ngHtml2JsPreprocessor: {
58-
cacheIdFromPath: function(filepath) {
59-
return filepath.substr(4);
60-
},
61-
moduleName: 'templates'
62-
},
63-
64-
6554
// web server port
6655
port: 9876,
6756

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
"karma-coverage": "^0.2.1",
4949
"karma-growler-reporter": "0.0.1",
5050
"karma-mocha": "^0.1.3",
51-
"karma-ng-html2js-preprocessor": "^0.1.0",
5251
"karma-phantomjs-launcher": "^0.1.4",
5352
"mocha": "^1.18.0",
5453
"mocha-lcov-reporter": "0.0.1",

test/directives/schema-form-test.js

Lines changed: 131 additions & 196 deletions
Large diffs are not rendered by default.

test/directives/sf-messages-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
chai.should();
22

33
describe('directive',function() {
4-
beforeEach(module('templates'));
54
beforeEach(module('schemaForm'));
65
beforeEach(
76
//We don't need no sanitation. We don't need no thought control.

test/protractor/conf.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/protractor/specs/custom-validation.js

Lines changed: 0 additions & 74 deletions
This file was deleted.

test/protractor/specs/validation-messages.js

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)