Merge branch 'beforeAll' into master

Conflicts:
	lib/jasmine-core/boot.js
	lib/jasmine-core/boot/boot.js
	lib/jasmine-core/jasmine.css
	lib/jasmine-core/jasmine.js
	spec/core/SpecSpec.js
	spec/core/SuiteSpec.js
	spec/core/integration/EnvSpec.js
	spec/node_suite.js
	src/core/Env.js
	src/core/requireCore.js
	src/core/util.js
This commit is contained in:
slackersoft
2014-09-24 20:19:47 -07:00
29 changed files with 2512 additions and 655 deletions

View File

@@ -30,6 +30,7 @@ body { overflow-y: scroll; }
.jasmine_html-reporter .bar.failed { background-color: #ca3a11; }
.jasmine_html-reporter .bar.passed { background-color: #007069; }
.jasmine_html-reporter .bar.skipped { background-color: #bababa; }
.jasmine_html-reporter .bar.errored { background-color: #ca3a11; }
.jasmine_html-reporter .bar.menu { background-color: #fff; color: #aaaaaa; }
.jasmine_html-reporter .bar.menu a { color: #333333; }
.jasmine_html-reporter .bar a { color: white; }