This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "jbehave-web".
The branch, master has been updated
via e275bed5cbdec40318ff7981ae734ae74cddf0fa (commit)
via f3627fe9edf7e4a2418645df67dbcfe53b7b7518 (commit)
from 68aae5823345475391bdac0aa66f4e340526d1ba (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e275bed5cbdec40318ff7981ae734ae74cddf0fa
Merge: f3627fe9edf7e4a2418645df67dbcfe53b7b7518
68aae5823345475391bdac0aa66f4e340526d1ba
Author: Mauro Talevi <[email protected]>
Date: Thu Nov 11 20:18:17 2010 +0000
Merge branch 'master' of ssh://git.codehaus.org/jbehave-web
Conflicts:
web-selenium/src/test/java/org/jbehave/web/selenium/PropertyWebDriverProviderTest.java
commit f3627fe9edf7e4a2418645df67dbcfe53b7b7518
Author: Mauro Talevi <[email protected]>
Date: Sun Nov 7 23:47:05 2010 +0000
JBEHAVE-383: Applied patch from Alan Parkinson.
-----------------------------------------------------------------------
Summary of changes:
...WebDriverStories.java => TraderWebStories.java} | 7 +--
web-selenium/pom.xml | 9 +++-
.../web/selenium/DefaultWebDriverProvider.java | 10 ++--
.../web/selenium/DelegatingWebDriverProvider.java | 13 +-----
.../web/selenium/PerScenarioWebDriverSteps.java | 2 +-
.../web/selenium/PerStoriesWebDriverSteps.java | 2 +-
.../web/selenium/PerStoryWebDriverSteps.java | 2 +-
.../web/selenium/PropertyWebDriverProvider.java | 27 ++++++++--
.../web/selenium/SeleniumScreenshotOnFailure.java | 13 +----
.../web/selenium/TypeWebDriverProvider.java | 40 +++++++++++++++
.../jbehave/web/selenium/WebDriverProvider.java | 17 +------
.../web/selenium/WebDriverScreenshotOnFailure.java | 11 +----
.../selenium/PerScenarioWebDriverStepsTest.java | 15 ++++--
.../web/selenium/PerStoryWebDriverStepsTest.java | 15 ++++--
.../selenium/PropertyWebDriverProviderTest.java | 51 ++++++++++++--------
15 files changed, 137 insertions(+), 97 deletions(-)
rename
examples/trader-runner-webdriver/src/main/java/org/jbehave/web/examples/trader/webdriver/{TraderWebDriverStories.java
=> TraderWebStories.java} (94%)
create mode 100644
web-selenium/src/main/java/org/jbehave/web/selenium/TypeWebDriverProvider.java
hooks/post-receive
--
jbehave-web
<hr/>
<p>
To unsubscribe from this list please visit:
</p>
<p>
<a
href="http://xircles.codehaus.org/manage_email";>http://xircles.codehaus.org/manage_email</a>
