Skip to content

Commit 295ef41

Browse files
authored
Merge pull request #62 from fiznool/master
Update deps to match latest version of jasmine-spec-reporter
2 parents 0782ac2 + c97eace commit 295ef41

File tree

4 files changed

+44
-6
lines changed

4 files changed

+44
-6
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ language: node_js
33
node_js:
44
- "4.2"
55
- "6"
6-
- "0.10"
76
cache:
87
directories:
98
- node_modules

README.md

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,42 @@ please be as specific as possible including operating system, `node`, `grunt`, a
209209
npm --versions
210210
```
211211
212-
## Migrating from before `v1.0.0` release
212+
## Migration notes
213213
214-
If you are updating to `v1.0.0`, you'll need to update your Gruntfile.
214+
### v1.x -> v2.x
215+
216+
The `spec` reporter configuration has changed for v2 of this plugin. The following is an example of the change in configuration that is needed. This is not an exhaustive list: refer to the [jasmine-spec-reporter](https://github.com/bcaudan/jasmine-spec-reporter) for a full reference of the configuration options.
217+
218+
``` js
219+
// v1
220+
reporters: {
221+
spec: {
222+
colors: true,
223+
displayStacktrace: 'summary',
224+
displaySuccessfulSpec: true
225+
}
226+
}
227+
228+
// v2
229+
reporters: {
230+
spec: {
231+
colors: {
232+
enabled: true
233+
},
234+
summary: {
235+
displayStacktrace: true
236+
},
237+
spec: {
238+
displaySuccessful: true
239+
}
240+
}
241+
}
242+
```
243+
244+
245+
### v0.x -> v1.x
246+
247+
If you are updating to `v1.x`, you'll need to update your Gruntfile.
215248
216249
The following example outlines the changes needed. It assumes the following folder structure:
217250
@@ -268,6 +301,10 @@ Please note that the junit reporter is no longer available. If you are using thi
268301
269302
## Release History
270303
304+
* `unreleased`
305+
- **Breaking changes alert! Ensure you read the migration guide before updating from previous versions**
306+
- Updated to jasmine-spec-reporter v3.1.0. Older style configuration needs to be updated, see migration guide for more details.
307+
- Removed support for Node.js v0.10
271308
* `v1.2.0` (2017-04-30)
272309
- Was compatible with Grunt `0.4` all the time, hence lowering the dependency requirement #60
273310
* `v1.1.1` (2016-08-29)

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
"dependencies": {
4040
"deepmerge": "^1.3.2",
4141
"istanbul": "^0.4.5",
42-
"jasmine": "^2.4.1",
42+
"jasmine": "^2.5.2",
4343
"jasmine-reporters": "^2.2.0",
44-
"jasmine-spec-reporter": "^2.5.0"
44+
"jasmine-spec-reporter": "^3.1.0"
4545
},
4646
"devDependencies": {
4747
"grunt": "^1.0.1",

tasks/jasmine-node-task.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var fs = require('fs'),
88
// 3rd party dependencies
99
var istanbul = require('istanbul'),
1010
Jasmine = require('jasmine'),
11-
SpecReporter = require('jasmine-spec-reporter'),
11+
SpecReporter = require('jasmine-spec-reporter').SpecReporter,
1212
deepmerge = require('deepmerge'),
1313
reporters = require('jasmine-reporters');
1414

@@ -172,6 +172,8 @@ module.exports = function jasmineNodeTask(grunt) {
172172
};
173173

174174
var addReporters = function addReporters(jasmine) {
175+
jasmine.env.clearReporters();
176+
175177
var ropts = options.jasmine.reporters;
176178

177179
var reporter;

0 commit comments

Comments
 (0)