summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/qt/tests
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-09-20 14:01:09 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-09-20 14:01:09 +0200
commit6dbcd09121fe266c7704a524b5cbd7f2754659c0 (patch)
tree5ae0d16cec0cc61f576d51c57b3a4613c7e91e22 /Source/WebKit/qt/tests
parent6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (diff)
Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit.org/repository/webkit/trunk@129119)
New snapshot with prospective build fix for incorrect QtWebKit master module header file creation
Diffstat (limited to 'Source/WebKit/qt/tests')
-rw-r--r--Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 0099d410a..0ede374e0 100644
--- a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -139,6 +139,7 @@ private Q_SLOTS:
void errorPageExtensionLoadFinished();
void userAgentApplicationName();
void userAgentNewlineStripping();
+ void undoActionHaveCustomText();
void viewModes();
@@ -3260,5 +3261,19 @@ void tst_QWebPage::loadSignalsOrder()
QTRY_VERIFY(loadSpy.isFinished());
}
+void tst_QWebPage::undoActionHaveCustomText()
+{
+ m_page->mainFrame()->setHtml("<div id=test contenteditable></div>");
+ m_page->mainFrame()->evaluateJavaScript("document.getElementById('test').focus()");
+
+ m_page->mainFrame()->evaluateJavaScript("document.execCommand('insertText', true, 'Test');");
+ QString typingActionText = m_page->action(QWebPage::Undo)->text();
+
+ m_page->mainFrame()->evaluateJavaScript("document.execCommand('indent', true);");
+ QString alignActionText = m_page->action(QWebPage::Undo)->text();
+
+ QVERIFY(typingActionText != alignActionText);
+}
+
QTEST_MAIN(tst_QWebPage)
#include "tst_qwebpage.moc"