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

fixes display of application when running tests. #714

Closed
wants to merge 3 commits into from

Conversation

angabriel
Copy link

iframe did not use full height

vojtajina and others added 2 commits August 21, 2013 04:47
This is just a temporary workaround to not break the WebStorm plugin.
@angabriel
Copy link
Author

Hmm, travis ci failed with this PR - but I just added some css..

INFO [Firefox 19.0.0 (Linux)]: Connected on socket XAdeFD0W3OZgqKJ0WCAB
1231INFO [karma]: Delaying execution, these browsers are not ready: Firefox 19.0.0 (Linux)
1232WARN [Firefox 19.0.0 (Linux)]: Disconnected
1233Firefox 19.0.0 (Linux): Executed 1 of 5 DISCONNECTED (2.136 secs / 0.002 secs)
1234[Error]
1235Fatal error: E2E test "test/e2e/reconnecting/karma.conf.js" failed.�
1236
1237The command "grunt" exited with 1.
1238
1239Done. Your build exited with 1.

@angabriel
Copy link
Author

Thank you Vojta

@clee704
Copy link

clee704 commented Sep 7, 2013

+1 Chrome is fine, but Firefox needs this patch.

@carolineBda
Copy link

Is it possible to push angabriel@4d77c49 as it fixes the problem for firefox?

@dignifiedquire
Copy link
Member

@angabriel Any chance you can rebase your two commits onto the latest master and squash them into one?

@angabriel
Copy link
Author

Hi Friedel, hmm i think rebasing is a bad idea as those changes were pushed to remote already.. Whats the benefit to squash these two tiny commits into one?

@dignifiedquire
Copy link
Member

@angabriel I meant rebasing onto the latest version of master, as there are merge conflicts atm and this gives a nice clean history. Regarding the remote location you can use a force push to overwrite the remote version with the local version.

@angabriel
Copy link
Author

already spent too much time on this. Actually whole sense of this PR was to add one single word to
static/client.html:19

  • body {
  • html, body {

perhaps you can commit this one-liner straight to master and i close this PR and maybe this repo.

dignifiedquire added a commit to dignifiedquire/karma that referenced this pull request Oct 13, 2013
@dignifiedquire
Copy link
Member

Done in #786

@angabriel
Copy link
Author

+1 Weltklasse, thx :)

vojtajina pushed a commit to vojtajina/karma that referenced this pull request Oct 22, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants