Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

[rc] Upgrade karma and jasmine dependencies #152

Merged
merged 5 commits into from
Nov 20, 2019
Merged

[rc] Upgrade karma and jasmine dependencies #152

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cae03fd
upgrade jasmine, karma-jasmine, and karma-chrome-launcher
Blackbaud-ErikaMcVey Jul 30, 2019
51f8d0e
upgrade jasmine types and karma covereage reporter
Blackbaud-ErikaMcVey Jul 30, 2019
d4c2650
update appveyor
Blackbaud-ErikaMcVey Jul 31, 2019
495b718
Merged master
Blackbaud-SteveBrush Oct 14, 2019
6f705a2
Merge branch 'rc-4.0.0' into upgrade-karma-jasmine
Blackbaud-SteveBrush Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
branches:
only:
- master
- /^rc-.*$/

environment:
nodejs_version: "10"
Expand Down
7 changes: 6 additions & 1 deletion config/karma/shared.karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,12 @@ function getConfig(config) {
captureTimeout: 3e5,
autoWatch: false,
singleRun: true,
failOnEmptyTestSuite: false
failOnEmptyTestSuite: false,
client: {
jasmine: {
random: false
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to turn off random here and in jasmine.json?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, the coverage:builder tests don't use karma so they still run randomly unless you set it in jasmine.json too

}
}
});
}

Expand Down
3 changes: 2 additions & 1 deletion jasmine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"spec_dir": "test",
"spec_files": [
"*.spec.js"
]
],
"random": false
}
Loading