Author: reebalazs
Date: Sun Dec 30 15:44:59 2007
New Revision: 50204
Added:
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/binderids/config.py
- copied unchanged from r50168,
kukit/kss.core/trunk/kss/core/plugins/core/demo/binderids/config.py
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/config.py
- copied unchanged from r50168,
kukit/kss.core/trunk/kss/core/plugins/core/demo/config.py
Removed:
kukit/kss.core/branch/finish-closures/kss/core/docs/
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/suite.html
Modified:
kukit/kss.core/branch/finish-closures/kss/core/configure.zcml
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/binderids/configure.zcml
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/configure.zcml
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/form_submit.html
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/inline_edit.html
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/selectors.html
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/two_select_revisited.html
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/two_selects.html
Log:
Merge up changes from trunk -r48594-50168
This includes the followings:
- switch to the demo registry
- enable tests to be used from kss.zope transition
- fix a bunch of tests failing mostly for '/n' difference, this
version confirmedly works with zelenium trunk.
Modified: kukit/kss.core/branch/finish-closures/kss/core/configure.zcml
==============================================================================
--- kukit/kss.core/branch/finish-closures/kss/core/configure.zcml
(original)
+++ kukit/kss.core/branch/finish-closures/kss/core/configure.zcml Sun Dec
30 15:44:59 2007
@@ -53,15 +53,6 @@
name="base2-dom-fp.js"
/>
- <browser:resource
- file="plugins/core/demo/selenium_tests/suite.html"
- name="suite.html"
- />
-
- <browser:resourceDirectory
- directory="plugins/core/demo/selenium_tests"
- name="coreselenium"
- />
<!-- Adapter used to render KSS commands -->
<adapter
for=".interfaces.IKSSCommands
Modified:
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/binderids/configure.zcml
==============================================================================
---
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/binderids/configure.zcml
(original)
+++
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/binderids/configure.zcml
Sun Dec 30 15:44:59 2007
@@ -1,6 +1,7 @@
<configure xmlns="http://namespaces.zope.org/zope";
xmlns:browser="http://namespaces.zope.org/browser";
xmlns:kss="http://namespaces.zope.org/kss";
+ xmlns:zcml="http://namespaces.zope.org/zcml";
i18n_domain="kss"
>
@@ -9,12 +10,14 @@
-->
<!-- Set up the demo utility, needed for registration -->
- <utility
- name="core_demo_for_binderids"
- factory=".zopeconfig.KSSDemos"
- provides="kss.demo.interfaces.IKSSDemoResource"
- permission="zope.Public"
- />
+ <configure zcml:condition="have kss_demo_version_1_2">
+ <utility
+ name="core_demo_for_binderids"
+ factory=".zopeconfig.KSSDemos"
+ provides="kss.demo.interfaces.IKSSDemoResource"
+ permission="zope.Public"
+ />
+ </configure>
<!-- Set up resources needed for the demo -->
<browser:page
Modified:
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/configure.zcml
==============================================================================
---
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/configure.zcml
(original)
+++
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/configure.zcml
Sun Dec 30 15:44:59 2007
@@ -1,6 +1,7 @@
<configure xmlns="http://namespaces.zope.org/zope";
xmlns:browser="http://namespaces.zope.org/browser";
xmlns:kss="http://namespaces.zope.org/kss";
+ xmlns:zcml="http://namespaces.zope.org/zcml";
i18n_domain="kss"
>
@@ -21,12 +22,14 @@
-->
<!-- Set up the demo utility -->
- <utility
- name="core"
- factory=".zopeconfig.KSSCoreDemos"
- provides="kss.demo.interfaces.IKSSDemoResource"
- permission="zope.Public"
- />
+ <configure zcml:condition="have kss_demo_version_1_2">
+ <utility
+ name="core"
+ factory=".zopeconfig.KSSCoreDemos"
+ provides="kss.demo.interfaces.IKSSDemoResource"
+ permission="zope.Public"
+ />
+ </configure>
<!-- change tag content -->
<browser:page
Modified:
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/form_submit.html
==============================================================================
---
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/form_submit.html
(original)
+++
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/form_submit.html
Sun Dec 30 15:44:59 2007
@@ -49,27 +49,27 @@
<td></td>
</tr>
<tr>
- <td>assertTextPresent</td>
+ <td>verifyTextPresent</td>
<td>100</td>
<td></td>
</tr>
<tr>
- <td>assertTextPresent</td>
+ <td>verifyTextPresent</td>
<td>Foobar</td>
<td></td>
</tr>
<tr>
- <td>assertTextPresent</td>
+ <td>verifyTextPresent</td>
<td>USA</td>
<td></td>
</tr>
<tr>
- <td>assertTextPresent</td>
+ <td>verifyTextPresent</td>
<td>John Foo</td>
<td></td>
</tr>
<tr>
- <td>assertTextPresent</td>
+ <td>verifyTextPresent</td>
<td>Bar street, 12</td>
<td></td>
</tr>
@@ -109,32 +109,37 @@
<td></td>
</tr>
<tr>
- <td>assertTextPresent</td>
+ <td>waitForTextPresent</td>
+ <td>dring</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
<td>Async saved:</td>
<td></td>
</tr>
<tr>
- <td>assertTextPresent</td>
+ <td>verifyTextPresent</td>
<td>dring</td>
<td></td>
</tr>
<tr>
- <td>assertTextPresent</td>
+ <td>verifyTextPresent</td>
<td>Southway</td>
<td></td>
</tr>
<tr>
- <td>assertTextPresent</td>
+ <td>verifyTextPresent</td>
<td>Norway</td>
<td></td>
</tr>
<tr>
- <td>assertTextPresent</td>
+ <td>verifyTextPresent</td>
<td>Brigitte Bardou</td>
<td></td>
</tr>
<tr>
- <td>assertTextPresent</td>
+ <td>verifyTextPresent</td>
<td>Cool street</td>
<td></td>
</tr>
Modified:
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/inline_edit.html
==============================================================================
---
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/inline_edit.html
(original)
+++
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/inline_edit.html
Sun Dec 30 15:44:59 2007
@@ -30,13 +30,8 @@
</tr>
<tr>
<td>waitForValue</td>
- <td>value</td>
- <td>click me!</td>
-</tr>
-<tr>
- <td>assertValue</td>
- <td>value</td>
- <td>click me!</td>
+ <td>save</td>
+ <td>save</td>
</tr>
<tr>
<td>type</td>
Modified:
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/selectors.html
==============================================================================
---
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/selectors.html
(original)
+++
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/selectors.html
Sun Dec 30 15:44:59 2007
@@ -25,8 +25,8 @@
</tr>
<tr>
<td>assertText</td>
- <td>target</td>
- <td>Target Click me!</td>
+ <td>parentnodeok</td>
+ <td>Click me!</td>
</tr>
<tr>
<td>click</td>
Deleted:
/kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/suite.html
==============================================================================
---
/kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/suite.html
Sun Dec 30 15:44:59 2007
+++ (empty file)
@@ -1,146 +0,0 @@
-<html>
- <body>
- <table id="suiteTable"
- cellpadding="1"
- cellspacing="1"
- border="1"
- class="selenium">
- <tbody>
- <tr><td><b>Test Suite</b></td></tr>
- <tr>
- <td>
- <h4>
- <a href="++resource++coreselenium/setDevMode.html">Development
mode</a>
- </h4>
- </td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/ecmaunit_tests.html">Ecmaunit
tests</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/basic_commands.html">Basic
commands</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/two_selects.html">Two
selects</a></td>
- <tr>
- <td><a href="++resource++coreselenium/two_select_revisited.html">Two
selects revisited</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/pf_forms.html">Forms</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/actions.html">Actions</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/autopupdate.html">Auto
update</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/ca_focus.html">Focus</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/cancel_submit.html">Prevent
default on click</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/preventdefault.html">Prevent
default</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/inline_edit.html">Inline
edit</a></td>
- </tr>
- <tr>
- <td><a
href="++resource++coreselenium/kss_prevent_bubbling.html">Bubbling</a></td>
- </tr>
- <tr>
- <td><a
href="++resource++coreselenium/kss_selector_param.html">Selector
parameters</a></td>
- </tr>
- <tr>
- <td><a
href="++resource++coreselenium/selectors.html">Selectors</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/more_selectors.html">More
Selectors</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/form_submit.html">Form
submit</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/error_handling.html">Error
handling</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/html_inserts.html">HTML
inserts</a></td>
- </tr>
- <tr>
- <td><a
href="++resource++coreselenium/binderclasses_temporary.html">Binder classes
handling</a></td>
- </tr>
- <tr>
- <td><a
href="++resource++coreselenium/binderids_temporary.html">Binder ids</a></td>
- </tr>
- <!--> </-->
- <tr>
- <td>
- <h4>
- <a href="++resource++coreselenium/setProdMode.html">Production
mode</a>
- </h4>
- </td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/ecmaunit_tests.html">Ecmaunit
tests</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/basic_commands.html">Basic
commands</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/two_selects.html">Two
selects</a></td>
- <tr>
- <td><a href="++resource++coreselenium/two_select_revisited.html">Two
selects revisited</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/pf_forms.html">Forms</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/actions.html">Actions</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/autopupdate.html">Auto
update</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/ca_focus.html">Focus</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/cancel_submit.html">Prevent
default on click</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/preventdefault.html">Prevent
default</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/inline_edit.html">Inline
edit</a></td>
- </tr>
- <tr>
- <td><a
href="++resource++coreselenium/kss_prevent_bubbling.html">Bubbling</a></td>
- </tr>
- <tr>
- <td><a
href="++resource++coreselenium/kss_selector_param.html">Selector
parameters</a></td>
- </tr>
- <tr>
- <td><a
href="++resource++coreselenium/selectors.html">Selectors</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/more_selectors.html">More
Selectors</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/form_submit.html">Form
submit</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/error_handling.html">Error
handling</a></td>
- </tr>
- <tr>
- <td><a href="++resource++coreselenium/html_inserts.html">HTML
inserts</a></td>
- </tr>
- <tr>
- <td><a
href="++resource++coreselenium/binderclasses_temporary.html">Binder classes
handling</a></td>
- </tr>
- <tr>
- <td><a
href="++resource++coreselenium/binderids_temporary.html">Binder ids</a></td>
- </tr>
- </tbody>
- </table>
- </body>
-</html>
Modified:
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/two_select_revisited.html
==============================================================================
---
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/two_select_revisited.html
(original)
+++
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/two_select_revisited.html
Sun Dec 30 15:44:59 2007
@@ -16,7 +16,7 @@
<tr>
<td>assertText</td>
<td>first-master</td>
- <td>animals machines</td>
+ <td>animals machines</td>
</tr>
<tr>
<td>assertText</td>
@@ -56,7 +56,7 @@
<tr>
<td>assertText</td>
<td>second-master</td>
- <td>animals machines</td>
+ <td>animals machines</td>
</tr>
<tr>
<td>assertText</td>
@@ -96,7 +96,7 @@
<tr>
<td>assertText</td>
<td>third-master</td>
- <td>animals machines</td>
+ <td>animals machines</td>
</tr>
<tr>
<td>assertText</td>
Modified:
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/two_selects.html
==============================================================================
---
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/two_selects.html
(original)
+++
kukit/kss.core/branch/finish-closures/kss/core/plugins/core/demo/selenium_tests/two_selects.html
Sun Dec 30 15:44:59 2007
@@ -16,7 +16,7 @@
<tr>
<td>assertText</td>
<td>first</td>
- <td>animals machines</td>
+ <td>animals machines</td>
</tr>
<tr>
<td>assertText</td>
_______________________________________________
Kukit-checkins mailing list
[email protected]
http://codespeak.net/mailman/listinfo/kukit-checkins
