Skip to content

Commit fb290d0

Browse files
committed
Remove no longer needed wrappedJSObject hack for Firefox 47 (Firefox stable is now 48)
1 parent db7c3dd commit fb290d0

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

test/testSelenium.js

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -108,25 +108,14 @@
108108
.then(function() {
109109
return globalDriver.wait(function() {
110110
return globalDriver.executeScript(function() {
111-
// Firefox 47 and Marionette Quirk
112-
if ('wrappedJSObject' in window) {
113-
return typeof window.wrappedJSObject.subscribeSuccess !== 'undefined';
114-
} else {
115-
return typeof window.subscribeSuccess !== 'undefined';
116-
}
111+
return typeof window.subscribeSuccess !== 'undefined';
117112
});
118113
});
119114
})
120115
.then(function() {
121116
return globalDriver.executeScript(function() {
122-
if ('wrappedJSObject' in window) {
123-
if (!window.wrappedJSObject.subscribeSuccess) {
124-
return window.wrappedJSObject.subscribeError;
125-
}
126-
} else {
127-
if (!window.subscribeSuccess) {
128-
return window.subscribeError;
129-
}
117+
if (!window.subscribeSuccess) {
118+
return window.subscribeError;
130119
}
131120

132121
return null;
@@ -139,11 +128,7 @@
139128
}
140129

141130
return globalDriver.executeScript(function() {
142-
if ('wrappedJSObject' in window) {
143-
return window.wrappedJSObject.testSubscription;
144-
} else {
145-
return window.testSubscription;
146-
}
131+
return window.testSubscription;
147132
});
148133
})
149134
.then(function(subscription) {

0 commit comments

Comments
 (0)