Skip to content

Copyedit: More natural language #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yamikuronue wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Copyedit: More natural language #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 scale.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ author: Dominik Dary
.span9
%h1 Scaling Selendroid by using the Selenium Grid
%h2#prerequisites Prerequisites
%p Steps to use selendroid together with the Selenium Grid on a local machine:
%p Steps to use selendroid together in a Selenium Grid configuration on your local machine:
%ol
%li Download selenium-server-standalone from the <a href="http://code.google.com/p/selenium/downloads/list">Selenium Project</a>
%li
Expand All @@ -28,13 +28,13 @@ author: Dominik Dary
%a{:href=>"#{site.selendroid_grid_plugin_download_link}"} Download selendroid-grid-plugin
%li copy all the artifacts into the folder where the selenium-server-standalone is stored.
%h2#start Start all servers
%p First, the selendroid-standalone should be started (more details you find <a href="#{site.setup_page}#launchingSelendroid">here</a>):</p>
%p First, the selendroid-standalone should be started (more details can be found <a href="#{site.setup_page}#launchingSelendroid">here</a>):</p>
%pre
%code.bash
= preserve do
:escaped
java -jar selendroid-standalone-#{site.current_version}-with-dependencies.jar -app selendroid-test-app-#{site.current_version}.apk -port 5555
%p Now you can start the Grid with the <code>selendroid-grid-plugin</code> that contains the proxy <code>io.selendroid.grid.SelendroidSessionProxy</code> and a simple capability matcher <code>io.selendroid.grid.SelendroidCapabilityMatcher</code>.
%p Now you can start the Grid with the <code>selendroid-grid-plugin</code>. This plugin contains the proxy <code>io.selendroid.grid.SelendroidSessionProxy</code> as well as a simple capability matcher <code>io.selendroid.grid.SelendroidCapabilityMatcher</code>.
%p Command to start the server on <em>Mac</em> & <em>Unix:</em>
%pre
%code.bash
Expand All @@ -48,7 +48,7 @@ author: Dominik Dary
:escaped
java -Dfile.encoding=UTF-8 -cp "selendroid-grid-plugin-#{site.current_version}.jar;selenium-server-standalone-#{site.latest_selenium_version}.jar" org.openqa.grid.selenium.GridLauncher -capabilityMatcher io.selendroid.grid.SelendroidCapabilityMatcher -role hub -host 127.0.0.1 -port 4444

%p Registering nodes to this grid can be done using this registration request (file name <code>selendroid-nodes-config.json</code>):
%p Registering nodes to this grid can be done using a JSON configuration file such as the following:
%pre
%code.json
= preserve do
Expand All @@ -71,16 +71,16 @@ author: Dominik Dary
"proxy": "io.selendroid.grid.SelendroidSessionProxy"
}
}
%p This configuration describes in the section <em>capabilities</em> two browsers that are available on the node machine. The first one <em>selendroid</em> is able to run tests agains the app under test (aut) <em>io.selendroid.testapp</em>. The second one <em>android</em> can run mobile web tests. The important thing is not to mix both entries, otherwise forwarding the session to the selendroid-standalone will fail. You can find details about how capabilities are used in selendroid <a href="http://selendroid.io/setup.html#DesiredCapabilities">here</a>.
%p The node registration can be done by sending the node config to the hub using <em>curl</em>:
%p This configuration describes in the <em>capabilities</em> section two browsers that are available on the node machine. The first one, <em>selendroid</em>, is able to run tests agains the app under test (aut) <em>io.selendroid.testapp</em>. The second one, <em>android</em>, can run mobile web tests. The important thing is not to mix both types of test in the same entry; otherwise, forwarding the session to the selendroid-standalone will fail. You can find details about how capabilities are used in selendroid <a href="http://selendroid.io/setup.html#DesiredCapabilities">here</a>.
%p The node registration can be done by sending the node config to the hub using <em>curl</em> (assuming the above config is named <code>selendroid-nodes-config.json</code>):
%pre
%code.bash
= preserve do
:escaped
curl -H "Content-Type: application/json" -X POST --data @selendroid-nodes-config.json http://localhost:4444/grid/register
%p Now you can verify in the <a href="http://localhost:4444/grid/console">Selenium Grid console</a>, that the node has been added to the grid hub.
%h2#runTests Run a Test
%p When defining desired capabilities, please verify that they are present in the grid hub and they match to the capablities of the selendroid-standalone server. Otherwise you will get an error that the session could not be forwarded.
%p Before defining desired capabilities, please verify that they are present in the grid hub and they match to the capablities of the selendroid-standalone server (as discussed above). Otherwise you will get an error that the session could not be forwarded.
%pre
%code.java
= preserve do
Expand Down