8000 Move test/**/*.js files to src/*.spec.js files · rubythonode/timesheet.js@466227b · GitHub
[go: up one dir, main page]
Skip to content

Commit 466227b

Browse files
sbstjnsbstjn
committed
Move test/**/*.js files to src/*.spec.js files
1 parent ab19f1b commit 466227b

File tree

9 files changed

+34
-39
lines changed

9 files changed

+34
-39
lines changed

‎.jshintignore

Whitespace-only changes.

‎.jshintrc

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

‎.karma.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,22 @@ module.exports = function(config) {
22
config.set({
33
basePath: '',
44
browsers: [
5-
"Chrome"
5+
"PhantomJS"
66
],
77
frameworks: [
88
'browserify',
99
'jasmine'
1010
],
1111
files: [
12-
'src/**/*.js',
13-
'test/**/*.js'
12+
'src/**/*.js'
1413
],
1514
exclude: [
1615

1716
],
1817
preprocessors: {
1918
'src/**/*.js': [
20-
'browserify'
21-
],
22-
'test/**/*.js': [
23-
'browserify'
19+
'browserify',
20+
'coverage'
2421
]
2522
},
2623
browserify: {

‎Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
test: karma
2+
13
karma:
2-
./node_modules/.bin/karma start .karma.js --single-run --reporters progress --log-level disable
4+
@./node_modules/.bin/karma start .karma.js --single-run --reporters progress --log-level disable
35

46
karma-watch:
57
./node_modules/.bin/karma start .karma.js --reporters progress --log-level disable

‎package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "With Timesheet.js you can easily create simple time and data sheets or timelines using HTML5, JavaScript and CSS3. Yep, it's a Vanilla JS library!",
55
"main": "index.js",
66
"scripts": {
7-
"test": "make karma"
7+
"test": "make test"
88
},
99
"repository": {
1010
"type": "git",
@@ -23,7 +23,6 @@
2323
"babel": "^6.5.2",
2424
"babel-polyfill": "^6.16.0",
2525
"babel-preset-es2015": "^6.16.0",
26-
"babel-preset-react": "^6.16.0",
2726
"babelify": "^7.3.0",
2827
"browserify": "^13.1.0",
2928
"jasmine-core": "^2.5.2",

‎src/bubble.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
export default class Bubble {
2+
constructor(start, end, label) {
3+
this.label = label;
4+
5+
this.date = {
6+
start: start,
7+
end: end
8+
};
9+
}
10+
}

‎src/bubble.spec.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import Bubble from '../src/bubble.js';
2+
3+
describe('Bubble', function () {
4+
const b = new Bubble(1, 2, "label");
5+
6+
it('should have a start and end value', () => {
7+
expect(b.date.start).toEqual(1);
8+
expect(b.date.end).toEqual(2);
9+
});
10+
11+
it("should have a label", () => {
12+
expect(b.label).toEqual("label")
13+
})
14+
});

‎src/main.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
class Timesheet {
1+
export default class Timesheet {
22
constructor(name) {
33
this.name = name
44
}
55
}
6-
7-
export default Timesheet;

‎test/main.test.js renamed to ‎src/main.spec.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import Timesheet from '../src/main.js';
22

33
describe('Timesheet', function () {
4-
let foo;
5-
6-
beforeEach(() => {
7-
foo = new Timesheet('custom');
8-
});
4+
const foo = new Timesheet('custom');
95

106
it('name should be set to "custom"', () => {
117
expect(foo.name).toEqual('custom');

0 commit comments

Comments
 (0)
0