Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ Mink v1.2 comes with four drivers out of the box:
the creator of the Symfony framework - Fabien Potencier.

* ``SahiDriver`` - provides a bridge for `Sahi <http://sahi.co.in/w/>`_ browser
controller. Sahi is a new JS browser controller, that fastly replaced old
controller. Sahi is a new JS browser controller, that fast replaced old
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This sentence should be reworded entirely as Sahi is not the recommended JS driver anymore since its development kinda stopped.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Have an idea for the new sentence ?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Well. I find this sentences still to be truth. Sahi did replaced old Selenium and is better in many cases. Though, Selenium2 is better than they both :D

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

But yeah, i think we could remove everything bout "easier to setup and to use" as right now, they're mostly the same in those terms (1 jar).

Selenium testing suite. It's both, easier to setup and to use than classical
Selenium. It has a GUI installer for each popular operating system out there
and is able to control every systems browser through a special bundled proxy
Expand Down Expand Up @@ -268,7 +268,7 @@ it with ``Driver\SahiDriver``:

If you want more control during driver initialization, like for example if you
want to configure the driver to talk with a proxy on another machine - use the
more verbose version with a second client arugment:
more verbose version with a second client argument:

.. code-block:: php

Expand All @@ -283,7 +283,7 @@ more verbose version with a second client arugment:
``$sid`` is a Sahi session ID. It's a unique string, used by the driver and
Sahi proxy in order to be able to talk with each other. You should fill
this with ``null`` if you want Sahi to start your browser automatically
or with some uniqe string if you want to control an already started browser.
or with some unique string if you want to control an already started browser.

``$host`` simply defines the host on which Sahi is started. It's
``localhost`` by default.
Expand Down Expand Up @@ -444,7 +444,7 @@ browser emulator with it:
// open another page:
$session->visit('http://my_project.dev/second_page.php')

// use history controlls:
// use history controls:
$session->reload();
$session->back();
$session->forward();
Expand All @@ -471,7 +471,7 @@ browser emulator with it:
Cookies and Headers management
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

With ``Mink\Session`` you can controll your browsers cookies and headers:
With ``Mink\Session`` you can control your browsers cookies and headers:

.. code-block:: php

Expand Down Expand Up @@ -681,7 +681,7 @@ There's whole lot more named selectors for you to use:
* ``link`` - for searching a link by its href, id, title, img alt or value
* ``button`` - for searching a button by its name, id, value, img alt or title
* ``link_or_button`` - for searching for both, links and buttons
* ``content`` - for sarching a specific page content (text)
* ``content`` - for searching a specific page content (text)
* ``select`` - for searching a select field by its id, name or label
* ``checkbox`` - for searching a checkbox by its id, name, or label
* ``radio`` - for searching a radio button by its id, name, or label
Expand Down Expand Up @@ -817,7 +817,7 @@ You can fill form fields/retrieve its values with form manipulation actions:

.. code-block:: php

// check/unchech checkbox:
// check/uncheck checkbox:
if ($el->isChecked()) {
$el->uncheck();
}
Expand Down