Skip to content

Commit ab2dda0

Browse files
committed
Prep to move tests into own project
1 parent 17b739c commit ab2dda0

File tree

5 files changed

+17
-63
lines changed

5 files changed

+17
-63
lines changed

Gruntfile.js

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,6 @@ module.exports = function(grunt) {
8181
}
8282
}
8383
},
84-
//Testing setup
85-
karma: {
86-
unit: {
87-
configFile: "OpenNote.Test/karma.conf.js",
88-
background: true
89-
},
90-
travis: {
91-
configFile: "OpenNote.Test/karma.conf.js",
92-
singleRun: true,
93-
browsers: ["PhantomJS"] //Override config browsers
94-
}
95-
},
96-
watch: {
97-
karma: {
98-
files: ["src/**/*.js", "test/unit/**/*.js"],
99-
tasks: ["karma:unit:run"]
100-
}
101-
},
10284
shell: {
10385

10486
clean: {
@@ -143,7 +125,6 @@ module.exports = function(grunt) {
143125
grunt.loadNpmTasks("grunt-contrib-jshint");
144126
grunt.loadNpmTasks("grunt-contrib-less");
145127
grunt.loadNpmTasks("grunt-contrib-watch");
146-
grunt.loadNpmTasks("grunt-karma");
147128
grunt.loadNpmTasks("grunt-shell");
148129
grunt.loadNpmTasks("grunt-manifest");
149130
grunt.loadNpmTasks("grunt-contrib-compress");
@@ -164,6 +145,5 @@ module.exports = function(grunt) {
164145

165146
//testing
166147
grunt.registerTask("devmode", ["karma:unit", "watch"]);
167-
grunt.registerTask("test", ["karma:travis"]);
168-
grunt.registerTask("ci", ["build", "jshint:all"]); //TODO , "karma:travis"
148+
grunt.registerTask("ci", ["build", "jshint:all"]);
169149
};

README.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Documentation
5252

5353
[How to upgrade][Upgrade]
5454

55-
[How to build][Build]
55+
[How to build](https://github.com/FoxUSA/OpenNote/blob/master/docs/Build.md)
5656

5757
[Themes][Themes]
5858

@@ -82,16 +82,15 @@ Credits
8282

8383
Kam Bnkamalesh - His TODO project heavily influenced my UI design
8484

85-
[topLevel]: https://raw.github.com/FoxUSA/OpenNote/master/Doc/screenShots/topLevel.png
86-
[dark]: https://raw.github.com/FoxUSA/OpenNote/master/Doc/screenShots/dark1.png
87-
[responsive]: https://raw.githubusercontent.com/FoxUSA/OpenNote/master/Doc/screenShots/OpenNote.png
85+
[topLevel]: https://raw.github.com/FoxUSA/OpenNote/master/docs/screenShots/topLevel.png
86+
[dark]: https://raw.github.com/FoxUSA/OpenNote/master/docs/screenShots/dark1.png
87+
[responsive]: https://raw.githubusercontent.com/FoxUSA/OpenNote/master/docs/screenShots/OpenNote.png
8888

89-
[Install]: https://github.com/FoxUSA/OpenNote/blob/master/Doc/Install.md
90-
[Upgrade]: https://github.com/FoxUSA/OpenNote/blob/master/Doc/Upgrade.md
91-
[Build]: https://github.com/FoxUSA/OpenNote/blob/master/Doc/Build.md
89+
[Install]: https://github.com/FoxUSA/OpenNote/blob/master/docs/Install.md
90+
[Upgrade]: https://github.com/FoxUSA/OpenNote/blob/master/docs/Upgrade.md
9291
[PHP]: https://github.com/FoxUSA/OpenNoteService-PHP
93-
[Dependencies]: https://github.com/FoxUSA/OpenNote/blob/master/Doc/Dependencies.md
94-
[Themes]: https://github.com/FoxUSA/OpenNote/blob/master/Doc/Themes.md
92+
[Dependencies]: https://github.com/FoxUSA/OpenNote/blob/master/docs/Dependencies.md
93+
[Themes]: https://github.com/FoxUSA/OpenNote/blob/master/docs/Themes.md
9594
[GitTip]: https://www.gittip.com/FoxUSA/
9695
[Bitcoins]: http://blockchain.info/address/15Q2jhnTvxDQm4LvTku68vTzU8j8dcLnLB
9796
[Alternative]: http://alternativeto.net/software/opennote/

docs/Build.md

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,14 @@
11
# How to build
2-
3-
## Clone
4-
You will need to clone the front end and the backend
5-
https://github.com/FoxUSA/OpenNote
6-
https://github.com/FoxUSA/OpenNoteService-PHP
7-
8-
Most of the build tasks require the OpenNote and OpenNoteService-PHP to be in the same folder
9-
10-
For example
11-
In the folder `OpenNote` we expect `openNote`, and `Service` to be sister folders.
12-
13-
I normally have `Service` folder as a symbolic link to `OpenNoteService-PHP/Service`;
14-
15-
Once the `OpenNote` and `OpenNoteService-PHP` project have been cloned you need to build the projects
16-
17-
To do so for the front end project
18-
- Run `npm install` to get the dev dependencies
19-
- Then, you need to run `grunt build` in `OpenNote/`(This runs bower install and builds the less CSS)
20-
21-
In the PHP service you will need too
22-
- You need to run `php ./composer.phar install -v` to install all the PHP dependencies and build the projects autoloading structure
23-
242
## Build Requirements
253
- npm
26-
- Bower `npm install -g bower`
274
- Grunt `npm install -g grunt-cli`
28-
- Composer
295

306
## Build
31-
Run from OpenNote project
7+
Clone this project
8+
`cd` into the project
9+
Run `npm install` to fetch and install dependencies
10+
Then run
3211
`grunt build`
12+
this will start a webpack dev server.
13+
14+
To test production bundles run `grunt testDeploy`

package.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,15 @@
2020
},
2121
"devDependencies": {
2222
"angular-mocks": "^1.6.6",
23-
"es5-shim": "4.1.1",
2423
"grunt": "^0.4.5",
2524
"grunt-cli": "^0.1.13",
2625
"grunt-contrib-compress": "^1.1.1",
2726
"grunt-contrib-connect": "^1.0.2",
2827
"grunt-contrib-jshint": "^1.0.0",
2928
"grunt-contrib-less": "^0.11.1",
3029
"grunt-contrib-watch": "^0.6.1",
31-
"grunt-karma": "^0.8.3",
3230
"grunt-manifest": "^0.4.0",
3331
"grunt-shell": "^0.7.0",
34-
"karma": "^0.12.14",
35-
"karma-firefox-launcher": "^0.1.3",
36-
"karma-jasmine": "~0.1.0",
37-
"karma-phantomjs-launcher": "^0.1.4",
38-
"phantomjs": "^1.9.7-5",
3932
"script-loader": "^0.7.2",
4033
"webpack": "^3.8.1",
4134
"webpack-dev-server": "^2.9.5"

test/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = function(config){
1+
module.exports = function(config){//TODO move this stuff into another project
22
config.set({
33
basePath : "../",
44
files : [

0 commit comments

Comments
 (0)