Skip to content

Commit

Permalink
- clean test classes and associated frawework not used
Browse files Browse the repository at this point in the history
  • Loading branch information
acheype committed Dec 13, 2017
1 parent 973ff4c commit fb12a7b
Show file tree
Hide file tree
Showing 59 changed files with 33,322 additions and 5,784 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "0.12"
- ">=8.0.0"
sudo: false
before_install: npm install -g grunt-cli
install: npm install
Expand Down
27 changes: 0 additions & 27 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,23 +79,6 @@ module.exports = function (grunt) {
/bootstrap-sass\/assets\/stylesheets/
],
ignorePath: /\.\.\/webapp\/bower_components\// // remove ../webapp/bower_components/ from paths of injected sass files
},
test: {
src: 'src/test/javascript/karma.conf.js',
exclude: [/angular-i18n/, /angular-scenario/],
ignorePath: /\.\.\/\.\.\//, // remove ../../ from paths of injected javascripts
devDependencies: true,
fileTypes: {
js: {
block: /(([\s\t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi,
detect: {
js: /'(.*\.js)'/gi
},
replace: {
js: '\'{{filePath}}\','
}
}
}
}
},
browserSync: {
Expand Down Expand Up @@ -305,12 +288,6 @@ module.exports = function (grunt) {
]
}
},
karma: {
unit: {
configFile: 'src/test/javascript/karma.conf.js',
singleRun: true
}
},
ngAnnotate: {
dist: {
files: [{
Expand Down Expand Up @@ -392,10 +369,8 @@ module.exports = function (grunt) {

grunt.registerTask('test', [
'clean:server',
'wiredep:test',
'ngconstant:dev',
'sass:server',
'karma'
]);

grunt.registerTask('build', [
Expand Down Expand Up @@ -438,13 +413,11 @@ module.exports = function (grunt) {
});

grunt.registerTask('buildOpenshift', [
'test',
'build',
'copy:generateOpenshiftDirectory'
]);

grunt.registerTask('deployOpenshift', [
'test',
'build',
'copy:generateOpenshiftDirectory',
'buildcontrol:openshift'
Expand Down
25 changes: 0 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,33 +43,8 @@ To ensure everything worked, run:

Then navigate to [http://localhost:8080](http://localhost:8080) in your browser.

# Testing

Unit tests are run by [Karma][] and written with [Jasmine][]. They're located in `src/test/javascript` and can be run with:

grunt test

# Continuous Integration

To setup this project in Jenkins, use the following configuration:

* Project name: `malaria-plant-db`
* Source Code Management
* Git Repository: `[email protected]:xxxx/malaria-plant-db.git`
* Branches to build: `*/master`
* Additional Behaviours: `Wipe out repository & force clone`
* Build Triggers
* Poll SCM / Schedule: `H/5 * * * *`
* Build
* Invoke Maven / Tasks: `-Pprod clean package`
* Post-build Actions
* Publish JUnit test result report / Test Report XMLs: `build/test-results/*.xml`

[JHipster]: https://jhipster.gitub.io/
[Node.js]: https://nodejs.org/
[Bower]: http://bower.io/
[Grunt]: http://gruntjs.com/
[BrowserSync]: http://www.browsersync.io/
[Karma]: http://karma-runner.github.io/
[Jasmine]: http://jasmine.github.io/2.0/introduction.html
[Protractor]: https://angular.github.io/protractor/
Loading

0 comments on commit fb12a7b

Please sign in to comment.