Permalink
Browse files

Merge branch 'release/1.4.0'

  • Loading branch information...
2 parents 91031cd + 110946a commit 93006b8d30cd6646f76d2ad993c2a3310a54fc61 @everzet everzet committed May 29, 2012
Showing with 2,037 additions and 7,645 deletions.
  1. +3 −2 .travis.yml
  2. +11 −0 CHANGES.md
  3. +1 −1 LICENSE
  4. +16 −60 README.md
  5. +0 −7 bin/install_deps
  6. +0 −8 bin/install_sahi
  7. +0 −6 bin/install_selenium
  8. +0 −3 bin/kill_sahi
  9. +0 −3 bin/kill_selenium
  10. +1 −1 bin/release
  11. +0 −11 bin/run_all_tests
  12. +0 −7 bin/start_sahi
  13. +0 −7 bin/start_selenium
  14. +16 −17 composer.json
  15. +0 −185 composer/packages.json
  16. +0 −22 features/bootstrap/FeatureContext.php
  17. +0 −21 features/mink_feature.feature
  18. +0 −22 features/mink_feature_ru.feature
  19. +0 −143 i18n/cs.xliff
  20. +0 −143 i18n/de.xliff
  21. +0 −143 i18n/es.xliff
  22. +0 −143 i18n/fr.xliff
  23. +0 −131 i18n/ja.xliff
  24. +0 −131 i18n/nl.xliff
  25. +0 −143 i18n/pl.xliff
  26. +0 −131 i18n/pt.xliff
  27. +0 −143 i18n/ru.xliff
  28. +0 −131 i18n/sv.xliff
  29. +1 −6 phpunit.xml.dist
  30. +0 −689 src/Behat/Mink/Behat/Context/BaseMinkContext.php
  31. +0 −315 src/Behat/Mink/Behat/Context/MinkContext.php
  32. +1 −1 src/Behat/Mink/Compiler/MapFileCompiler.php
  33. +10 −28 src/Behat/Mink/Compiler/PearCompiler.php
  34. +5 −30 src/Behat/Mink/Compiler/PharCompiler.php
  35. +79 −64 src/Behat/Mink/Driver/DriverInterface.php
  36. +0 −39 src/Behat/Mink/Driver/Goutte/Client.php
  37. +0 −23 src/Behat/Mink/Driver/Goutte/CookieJar.php
  38. +0 −680 src/Behat/Mink/Driver/GoutteDriver.php
  39. +0 −598 src/Behat/Mink/Driver/SahiDriver.php
  40. +0 −67 src/Behat/Mink/Driver/Selenium2/syn.js
  41. +0 −836 src/Behat/Mink/Driver/Selenium2Driver.php
  42. +0 −652 src/Behat/Mink/Driver/SeleniumDriver.php
  43. +0 −123 src/Behat/Mink/Driver/Zombie/Connection.php
  44. +0 −264 src/Behat/Mink/Driver/Zombie/Server.php
  45. +0 −749 src/Behat/Mink/Driver/ZombieDriver.php
  46. +7 −5 src/Behat/Mink/Element/DocumentElement.php
  47. +27 −8 src/Behat/Mink/Element/Element.php
  48. +16 −14 src/Behat/Mink/Element/ElementInterface.php
  49. +29 −23 src/Behat/Mink/Element/NodeElement.php
  50. +41 −37 src/Behat/Mink/Element/TraversableElement.php
  51. +5 −1 src/Behat/Mink/Exception/DriverException.php
  52. +7 −7 src/Behat/Mink/Exception/ElementHtmlException.php
  53. +7 −7 src/Behat/Mink/Exception/ElementNotFoundException.php
  54. +2 −2 src/Behat/Mink/Exception/ElementTextException.php
  55. +16 −21 src/Behat/Mink/Exception/Exception.php
  56. +5 −5 src/Behat/Mink/Exception/ExpectationException.php
  57. +2 −2 src/Behat/Mink/Exception/ResponseTextException.php
  58. +4 −4 src/Behat/Mink/Exception/UnsupportedDriverActionException.php
  59. +28 −12 src/Behat/Mink/Mink.php
  60. +0 −32 src/Behat/Mink/PHPUnit/Constraints/PageContains.php
  61. +0 −236 src/Behat/Mink/PHPUnit/TestCase.php
  62. +6 −2 src/Behat/Mink/Selector/CssSelector.php
  63. +7 −5 src/Behat/Mink/Selector/NamedSelector.php
  64. +3 −3 src/Behat/Mink/Selector/SelectorInterface.php
  65. +14 −14 src/Behat/Mink/Selector/SelectorsHandler.php
  66. +45 −25 src/Behat/Mink/Session.php
  67. +557 −0 src/Behat/Mink/WebAssert.php
  68. +44 −4 tests/Behat/Mink/Driver/GeneralDriverTest.php
  69. +0 −16 tests/Behat/Mink/Driver/GoutteDriverTest.php
  70. +60 −0 tests/Behat/Mink/Driver/JavascriptDriverTest.php
  71. +0 −51 tests/Behat/Mink/Driver/SahiDriverTest.php
  72. +0 −36 tests/Behat/Mink/Driver/Selenium2DriverTest.php
  73. +0 −52 tests/Behat/Mink/Driver/SeleniumDriverTest.php
  74. +0 −2 tests/Behat/Mink/Driver/Zombie/server-fixtures/empty_server.js
  75. +0 −10 tests/Behat/Mink/Driver/Zombie/server-fixtures/test_server.js
  76. +0 −36 tests/Behat/Mink/Driver/ZombieDriverTest.php
  77. +20 −0 tests/Behat/Mink/Driver/web-fixtures/basic_get_form.php
  78. +11 −0 tests/Behat/Mink/Driver/web-fixtures/iframe.php
  79. +9 −0 tests/Behat/Mink/Driver/web-fixtures/iframe_inner.php
  80. +19 −0 tests/Behat/Mink/Driver/web-fixtures/issue178.html
  81. +17 −0 tests/Behat/Mink/Driver/web-fixtures/issue215.html
  82. +21 −0 tests/Behat/Mink/Driver/web-fixtures/issue225.php
  83. +12 −0 tests/Behat/Mink/Driver/web-fixtures/popup1.php
  84. +12 −0 tests/Behat/Mink/Driver/web-fixtures/popup2.php
  85. +25 −0 tests/Behat/Mink/Driver/web-fixtures/window.php
  86. +0 −43 tests/Behat/Mink/PHPUnit/TestCaseTest.php
  87. +1 −1 tests/Behat/Mink/Selector/CssSelectorTest.php
  88. +814 −0 tests/Behat/Mink/WebAssertTest.php
View
@@ -10,6 +10,7 @@ branches:
- develop
before_script:
- - bin/install_deps
+ - curl http://getcomposer.org/installer | php
+ - php composer.phar install --dev
-script: phpunit --group unittest
+script: phpunit
View
@@ -1,3 +1,14 @@
+1.4.0 / 2012-05-40
+==================
+
+ * New `Session::selectWindow()` and `Session::selectIFrame()` methods
+ * New built-in `WebAssert` class
+ * Fixed DocBlocks (autocompletion in any IDE now should just work)
+ * Moved Behat-related code into `Behat\MinkExtension`
+ * Removed PHPUnit test case class
+ * Updated composer dependencies to not require custom repository anymore
+ * All drivers moved into separate packages
+
1.3.3 / 2012-03-23
==================
View
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Konstantin Kudryashov <ever.zet@gmail.com>
+Copyright (c) 2012 Konstantin Kudryashov <ever.zet@gmail.com>
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
View
@@ -16,17 +16,18 @@ Usage Example
use Behat\Mink\Mink,
Behat\Mink\Session,
Behat\Mink\Driver\GoutteDriver,
+ Behat\Mink\Driver\Goutte\Client as GoutteClient,
Behat\Mink\Driver\SahiDriver;
$startUrl = 'http://example.com';
// init Mink and register sessions
-$mink = new Mink(
- 'goutte1' => new Session(new GoutteDriver($startUrl)),
- 'goutte2' => new Session(new GoutteDriver($startUrl)),
- 'javascript' => new Session(new SahiDriver($startUrl, 'firefox')),
+$mink = new Mink(array(
+ 'goutte1' => new Session(new GoutteDriver(GoutteClient($startUrl))),
+ 'goutte2' => new Session(new GoutteDriver(GoutteClient($startUrl))),
+ 'javascript' => new Session(new SahiDriver('firefox')),
'custom' => new Session(new MyCustomDriver($startUrl))
-);
+));
// set default session name
$mink->setDefaultSessionName('goutte2');
@@ -51,62 +52,19 @@ $mink->getSession('goutte2')->getPage()->findLink('Chat')->click();
Install Dependencies
--------------------
- wget http://getcomposer.org/composer.phar
- php composer.phar install
-
-How to run Mink test suite
---------------------------
-
-1. Install dependencies (including Sahi and Selenium)
-
- ``` bash
- bin/install_deps
- bin/install_sahi
- bin/install_selenium
- ```
-
-2. To run all tests - call `bin/run_all_tests`
-
-If you want to run specific driver tests, use appropriate PHPUnit group
-and make sure that `Sahi`/`Selenium` is runned if you want to test
-one of them:
-
``` bash
-bin/start_sahi
-phpunit --group sahidriver
-bin/kill_sahi
+curl http://getcomposer.org/installer | php
+php composer.phar install
```
-``` bash
-bin/start_selenium
-phpunit --group seleniumdriver
-bin/kill_selenium
-```
-
-`Zombie` and `Goutte` driver tests doesn't require some specific proxy
-to be runned and could be tested as is:
-
-``` bash
-phpunit --group zombiedriver
-```
-
-``` bash
-phpunit --group gouttedriver
-```
-
-Translated languages
---------------------
-
-For now exist 10 translated languages: `cs`,`de`,`es`,`fr`,`ja`,`nl`,`pl`,`pt`,`ru`,`sv`.
-
-**Note:** The `ja`,`nl`,`pt` and `sv` are outdated.
-
-#### How to add a new translated language?
-
-If you want to translate another language, you can use as reference the `ru` language file under
-[translations folder](https://github.com/Behat/Mink/tree/develop/i18n).
+Behat integration and translated languages
+------------------------------------------
-**Important:** The filename must match with the same translated language file in [Behat](https://github.com/Behat/Behat/tree/master/i18n) and [Gherkin](https://github.com/Behat/Gherkin/tree/master/i18n) in order to work correctly. If the language does not exist in [Gherkin](https://github.com/Behat/Gherkin/tree/master/i18n) and [Behat](https://github.com/Behat/Behat/tree/master/i18n) you must add it there too.
+Behat integration altogether with translations have moved into separate
+project called `MinkExtension`. It's an extension to Behat 2.4. This will
+lead to much faster release cycles as `MinkExtension` doesn't have actual
+releases - any accepted PR about language translation or new step definitions
+will immediately go into live.
Copyright
---------
@@ -117,9 +75,7 @@ Contributors
------------
* Konstantin Kudryashov [everzet](http://github.com/everzet) [lead developer]
-* Pascal Cremer [b00giZm](http://github.com/b00giZm) [ZombieDriver creator]
-* Alexandre Salomé [alexandresalome](http://github.com/alexandresalome) [SeleniumDriver creator]
-* Pete Otaqui [pete-otaqui](http://github.com/pete-otaqui) [Selenium2Driver creator]
+* Other [awesome developers](https://github.com/Behat/Mink/graphs/contributors)
Sponsors
--------
View
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-BASEDIR=$(dirname $0)
-cd $BASEDIR/..
-
-wget -nc http://getcomposer.org/composer.phar
-php composer.phar install
View
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-BASEDIR=$(dirname $0)
-cd $BASEDIR/../vendor
-
-wget http://downloads.sourceforge.net/project/sahi/sahi-v35/20110719/sahi_20110719.zip -O sahi.zip
-unzip sahi.zip
-rm sahi.zip
View
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-BASEDIR=$(dirname $0)
-cd $BASEDIR/../vendor
-
-wget http://selenium.googlecode.com/files/selenium-server-standalone-2.20.0.jar -O selenium.jar
View
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-ps -ef|grep sahi|grep -v grep|awk '{print $2}'|xargs kill -9
View
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-ps -ef|grep selenium|grep -v grep|awk '{print $2}'|xargs kill -9
View
@@ -17,7 +17,7 @@
* @author Konstantin Kudryashov <ever.zet@gmail.com>
*/
-require_once __DIR__ . '/../vendor/.composer/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
use Behat\Mink\Compiler;
View
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-bin/kill_sahi
-bin/start_sahi
-bin/kill_selenium
-bin/start_selenium
-
-phpunit
-
-bin/kill_selenium
-bin/kill_sahi
View
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-BASEDIR=$(dirname $0)
-cd $BASEDIR/../vendor/sahi/bin
-
-sh sahi.sh > /dev/null &
-sleep 5
View
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-BASEDIR=$(dirname $0)
-cd $BASEDIR/../vendor
-
-java -jar selenium.jar > /dev/null &
-sleep 5
View
@@ -16,30 +16,29 @@
"require": {
"php": ">=5.3.1",
- "symfony/browser-kit": ">=2.0,<2.2-dev",
- "symfony/dom-crawler": ">=2.0,<2.2-dev",
- "symfony/css-selector": ">=2.0,<2.2-dev",
- "symfony/finder": ">=2.0,<2.2-dev",
- "symfony/process": ">=2.0,<2.2-dev"
+ "symfony/css-selector": ">=2.0.0,<2.2.0-dev"
},
- "recommend": {
- "fabpot/goutte": "*",
- "behat/sahi-client": ">=1.0.1,<1.1-dev",
- "alexandresalome/php-selenium": "*",
- "facebook/php-webdriver": "*"
+ "require-dev": {
+ "behat/mink-goutte-driver": "*",
+ "behat/mink-sahi-driver": "*",
+ "behat/mink-selenium-driver": "*",
+ "behat/mink-selenium2-driver": "*",
+ "behat/mink-zombie-driver": "*",
+ "symfony/finder": ">=2.0.0,<2.2.0-dev"
+ },
+
+ "suggest": {
+ "behat/mink-goutte-driver": "to enable Goutte support",
+ "behat/mink-sahi-driver": "to enable Sahi.JS support",
+ "behat/mink-selenium-driver": "to enable Selenium1 support",
+ "behat/mink-selenium2-driver": "to enable Selenium2 (webdriver support)",
+ "behat/mink-zombie-driver": "to enable Zombie.js support"
},
"autoload": {
"psr-0": {
"Behat\\Mink": "src/"
}
- },
-
- "repositories": {
- "behat/mink-deps": {
- "type": "composer",
- "url": "behat.org"
- }
}
}
Oops, something went wrong.

0 comments on commit 93006b8

Please sign in to comment.