Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Improvements to the Inline Editor Tests #4598

Merged
merged 5 commits into from
Aug 1, 2013
Merged

Improvements to the Inline Editor Tests #4598

merged 5 commits into from
Aug 1, 2013

Conversation

TomMalbran
Copy link
Contributor

This commit basically joins all the htmlToCSSProvider tests inside the Inline Editor Tests into the same window. These are lots of tests where each used a single window, so this makes it faster and nicer to test. There are 3 test left that check for the Inline editor priority were each use their own window since I wasn't sure how to best change those test to be handled inside the same window. But anyway the testing is a lot nicer.

This branch is based on #4581, so is best to merge that one first.

@ghost ghost assigned jasonsanjose Jul 30, 2013
@jasonsanjose
Copy link
Member

@TomMalbran I'm seeing a failure in should close inline editor when file deleted on disk. Can you reproduce?

@TomMalbran
Copy link
Contributor Author

@jasonsanjose Yes, I was able to reproduce it, but it got fixed with the use of runs when closing all the files, where using just 1 runs worked, but using 2 didn't.

@jasonsanjose
Copy link
Member

@TomMalbran I merged #4581. Can you update this branch to fix the conflicts? Thanks!

@TomMalbran
Copy link
Contributor Author

@jasonsanjose PR updated.

I was still able to get should close inline editor when file deleted on disk failures. Usually on the first run, but not always, and worked on a rerun. I still always get should delete the temp directory errors, but I had them before this change and I had the same error when deleting folders.

var $dlg = _testWindow.$(".modal.instance");
if ($dlg.length) {
clickDialogButton("dontsave");
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be replaced with Dialogs.cancelModalDialogIfOpen if it could receive an additional and optional button ID parameter.

@jasonsanjose
Copy link
Member

Ok. Given the state of or build machine (integration tests run out of memory), I'd rather take this fix and the new failures and address those failures separately.

jasonsanjose added a commit that referenced this pull request Aug 1, 2013
Improvements to the Inline Editor Tests
@jasonsanjose jasonsanjose merged commit 933f1f0 into adobe:master Aug 1, 2013
@TomMalbran TomMalbran deleted the tom/inline-editor-tests branch August 1, 2013 21:15
jasonsanjose added a commit that referenced this pull request Sep 4, 2013
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants