Fixes console check for IE8

- Was causing IE8 to hang for some reason
- Also reverts previous commit, not that issue was resolved

[#79533268][fixes #80356450]
This commit is contained in:
Gerg
2014-10-09 00:41:17 -07:00
parent f77071254a
commit c8cd2eabe5
4 changed files with 8 additions and 4 deletions

View File

@@ -101,7 +101,7 @@ jasmineRequire.HtmlReporter = function(j$) {
var failures = [];
this.specDone = function(result) {
if(noExpectations(result) && console && console.error) {
if(noExpectations(result) && typeof console !== 'undefined' && typeof console.error !== 'undefined') {
console.error('Spec \'' + result.fullName + '\' has no expectations.');
}

View File

@@ -200,6 +200,10 @@ describe("JsApiReporter", function() {
reporter.suiteDone(suiteResult2);
});
it('should not include suite starts', function(){
expect(reporter.suiteResults(0,3).length).toEqual(2);
});
it("should return a slice of results", function() {
expect(reporter.suiteResults(0, 1)).toEqual([suiteResult1]);
expect(reporter.suiteResults(1, 1)).toEqual([suiteResult2]);

View File

@@ -65,8 +65,8 @@ describe("New HtmlReporter", function() {
describe("when a spec is done", function() {
it("logs errors to the console and prints a special symbol if it is an empty spec", function() {
if (!window.console) {
window.console = { error: function(){} };
if (typeof console === "undefined") {
console = { error: function(){} };
}
var env = new j$.Env(),

View File

@@ -72,7 +72,7 @@ jasmineRequire.HtmlReporter = function(j$) {
var failures = [];
this.specDone = function(result) {
if(noExpectations(result) && console && console.error) {
if(noExpectations(result) && typeof console !== 'undefined' && typeof console.error !== 'undefined') {
console.error('Spec \'' + result.fullName + '\' has no expectations.');
}