Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: add IE11 support #5224

Closed
wants to merge 72 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
20b23b6
initial spike adding firefox support (wip) [skip ci]
chrisbreiding Jan 9, 2018
2005023
server: properly set ports to numbers, and disable 'no_proxies_on' fi…
brian-mann Jan 10, 2018
b9edfc7
remove unused packages
chrisbreiding Jan 10, 2018
98382c1
fix background specs
chrisbreiding Jan 10, 2018
f3962e0
runner: update browser icons and ‘chrome extension’ reference
chrisbreiding Jan 10, 2018
cf953a9
Merge branch 'develop' into issue-1096-firefox-support
chrisbreiding Jan 10, 2018
779307a
fix firefox exit listening
chrisbreiding Jan 12, 2018
69146d2
fix click spec to be consistent in firefox
chrisbreiding Jan 12, 2018
43e3305
fix scroll spec to be consistent in firefox
chrisbreiding Jan 12, 2018
c494e37
fix trigger spec to be consistent in firefox
chrisbreiding Jan 12, 2018
3d795c0
fix scrolling in runner/reporter in firefox
chrisbreiding Jan 16, 2018
9a9ca4b
fix querying spec
chrisbreiding Jan 16, 2018
d5793fe
fix reporter bottom padding in firefox
chrisbreiding Jan 16, 2018
a3fb6ce
fix return value spec in firefox
chrisbreiding Jan 16, 2018
a643399
fix runner ui issue in firefox
chrisbreiding Jan 19, 2018
eacf137
Merge branch 'develop' into issue-1096-firefox-support
chrisbreiding Feb 12, 2018
7df4da7
server: fix chrome spec
chrisbreiding Feb 14, 2018
1ecb367
server: load extension via firefox-connect
chrisbreiding Feb 14, 2018
016747c
server: re-use same profile dir for firefox
chrisbreiding Feb 14, 2018
f3ecbac
server: add support for before:browser:launch plugin to firefox
chrisbreiding Feb 14, 2018
4e447a9
server: set user-agent in firefox
chrisbreiding Feb 14, 2018
def3325
driver: add browser property and methods
chrisbreiding Feb 16, 2018
515c848
driver: refactor browser methods
chrisbreiding Feb 16, 2018
b265027
runner: hide selector playground if not chrome
chrisbreiding Feb 16, 2018
68a6ad4
add support for firefox developer edition and firefox nightly
chrisbreiding Feb 16, 2018
a065b70
driver: forgot to commit browser spec
chrisbreiding Feb 22, 2018
51f1ca6
driver: fix browser specs
chrisbreiding Feb 23, 2018
5dd5d46
Merge branch 'develop' into issue-1096-firefox-support
chrisbreiding May 24, 2018
ba1ff54
Merge branch 'develop' into issue-1096-firefox-support
chrisbreiding Jun 5, 2018
82e4e44
update how firefox gets profile dir
chrisbreiding Jun 5, 2018
c3c5d48
fix tests failing due to dom element serialization
chrisbreiding Jun 5, 2018
5c0cec9
fix typos
chrisbreiding Jun 7, 2018
1a5bdf8
add size to contentedible type test div
chrisbreiding Jun 7, 2018
212282a
add firefox scripts
chrisbreiding Jun 7, 2018
f449899
update chai path reference
chrisbreiding Jun 7, 2018
c1902b1
focus element twice for firefox’s sake
chrisbreiding Jun 7, 2018
8bf74c9
mark driver tests failing in firefox
chrisbreiding Jun 7, 2018
9079f37
ensure profile dir exists for firefox
chrisbreiding Jun 7, 2018
7784e0b
log -> debug
chrisbreiding Jun 7, 2018
dad3557
mark e2e tests that fail in firefox
chrisbreiding Jun 13, 2018
c8d7ffc
use correct ssl proxy preference keys for firefox
chrisbreiding Jun 13, 2018
14bd178
wip - get firefox to accept insecure (self-signed) certs
chrisbreiding Jun 13, 2018
07469aa
get ssl working in firefox
chrisbreiding Jun 15, 2018
b5077fe
ensure clean disk cache in firefox
chrisbreiding Jun 15, 2018
d391097
fix hasActiveWindow in firefox
chrisbreiding Jun 18, 2018
276d0c8
remove old firefox fixme label
chrisbreiding Jun 19, 2018
d083873
fix firefox utils.appendErrMsg
chrisbreiding Jun 19, 2018
629d8c8
Merge branch 'develop' into issue-1096-firefox-support
chrisbreiding Jun 19, 2018
5e5d25c
remove redundant line
chrisbreiding Jun 20, 2018
85479c9
skip failing type test in firefox
chrisbreiding Jun 20, 2018
957ed3a
fix e2e snapshot browser replacement
chrisbreiding Jun 20, 2018
fc21a0e
fix 573 spec in firefox
chrisbreiding Jun 20, 2018
436faef
fix issue with reporter instance not being created
chrisbreiding Jun 20, 2018
e417e31
mark new / clarify failing firefox tests
chrisbreiding Jun 20, 2018
4d60fad
Merge branch 'develop' into issue-1096-firefox-support
brian-mann Jul 24, 2018
2076c26
WIP firefox native events
kuceb Sep 12, 2018
61a9965
WIP firefox native events
kuceb Sep 12, 2018
37c8d94
ie w/out patched sync socket
kuceb Sep 14, 2018
2062e9c
add iframe test page
kuceb Sep 14, 2018
385f872
add iframe actions API
kuceb Sep 15, 2018
5af949d
use async marionette-client
kuceb Sep 17, 2018
1d9033b
wip [skip ci] ie-proxy
kuceb Sep 28, 2018
b63e11b
wip [skip ci] cherry-pick pac
kuceb Sep 28, 2018
7e3e689
configure pac for chrome and electron
kuceb Oct 2, 2018
e63b3b6
--amend
kuceb Oct 2, 2018
05d1978
temp
kuceb Oct 2, 2018
c3a4399
Merge remote-tracking branch 'origin/develop' into issue-1098-firefox…
kuceb Oct 2, 2018
4afc959
Merge branch 'issue-1096-firefox-support' into issue-311-ie-ff
kuceb Oct 2, 2018
77c2c0c
update set-zunder-config.js
kuceb Oct 2, 2018
f9e7cd1
update zunder to compile node_modules, ie work
kuceb Oct 15, 2018
f04c157
fix css spinners, fix command log
kuceb Oct 15, 2018
b6611e2
Fix interactive mode reload throwing (#2603)
chrisbreiding Oct 15, 2018
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: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
"stop-only": "2.1.0",
"terminal-banner": "^1.0.0",
"typescript": "^2.3.4",
"vagrant": "0.0.1",
"vinyl-paths": "^2.1.0"
},
"author": "Brian Mann",
Expand Down
3 changes: 3 additions & 0 deletions packages/desktop-gui/src/app/nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@
.canary > i { color: #e4b721; }
.chromium > i { color: #829ac3; }
.electron > i { color: #777; }
.firefox > i { color: #ff7d08; }
.firefox-developer-edition > i { color: #006ad9; }
.firefox-nightly > i { color: #a752f7; }
}

.nav .browser-info {
Expand Down
7 changes: 2 additions & 5 deletions packages/desktop-gui/src/lib/browser-model.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import _ from 'lodash'
import { computed, observable } from 'mobx'

export default class Browser {
@observable name
@observable displayName
@observable version
@observable path
@observable majorVersion
Expand All @@ -11,16 +11,13 @@ export default class Browser {

constructor (browser) {
this.name = browser.name
this.displayName = browser.displayName
this.version = browser.version
this.path = browser.path
this.majorVersion = browser.majorVersion
this.info = browser.info
}

@computed get displayName () {
return _.capitalize(this.name)
}

@computed get icon () {
return 'chrome'
}
Expand Down
6 changes: 5 additions & 1 deletion packages/desktop-gui/src/lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ const osIconLookup = {

const browserIconLookup = {
chrome: 'chrome',
Electron: 'chrome',
chromium: 'chrome',
canary: 'chrome',
electron: 'chrome',
firefox: 'firefox',
firefoxDeveloperEdition: 'firefox',
firefoxNightly: 'firefox',
safari: 'safari',
}

Expand Down
6 changes: 4 additions & 2 deletions packages/desktop-gui/src/project-nav/browsers.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import _ from 'lodash'
import React, { Component } from 'react'
import { observer } from 'mobx-react'
import Tooltip from '@cypress/react-tooltip'
import Dropdown from '../dropdown/dropdown'

import projectsApi from '../projects/projects-api'
import utils from '../lib/utils'

@observer
export default class Browsers extends Component {
Expand Down Expand Up @@ -63,12 +65,12 @@ export default class Browsers extends Component {
icon = 'check-circle-o green'
prefixText = 'Running'
} else {
icon = browser.icon
icon = utils.browserIcon(browser.name)
prefixText = ''
}

return (
<span className={browser.name}>
<span className={_.kebabCase(browser.name)}>
<i className={`fa fa-${icon}`}></i>{' '}
{prefixText}{' '}
{browser.displayName}{' '}
Expand Down
6 changes: 3 additions & 3 deletions packages/driver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"main": "index.js",
"browser": "src/main",
"scripts": {
"start": "../coffee/node_modules/.bin/coffee test/support/server.coffee",
"cypress:open": "node ../../scripts/cypress open --project ./test",
"cypress:run": "node ../../scripts/cypress run --project ./test",
"start": "coffee test/support/server.coffee",
"cypress:open": "node ../../cli/bin/cypress open --dev --project ./test",
"cypress:run": "node ../../scripts/run-cypress-tests.js --dir test",
"clean-deps": "rm -rf node_modules"
},
"files": [
Expand Down
1 change: 1 addition & 0 deletions packages/driver/src/cy/chai.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ chai.use (chai, u) ->
assert._obj = $dom.stringify(obj, "short")

msg = getMessage.call(@, assert, args)
# msg = 'foobarbaz'

## restore the real obj if we changed it
if obj isnt assert._obj
Expand Down
1 change: 1 addition & 0 deletions packages/driver/src/cy/errors.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ create = (state, config, log) ->

createUncaughtException = (type, args) ->
[msg, source, lineno, colno, err] = args
debugger

current = state("current")

Expand Down
Loading