Commit a29acfdd a29acfdd8a928d20981c0ac943b983c22576dc4a by Nicolas Perriault

refs #532 - added bitds of docs regarding SlimerJS support

1 parent 6779081d
...@@ -87,7 +87,7 @@ Execution results: ...@@ -87,7 +87,7 @@ Execution results:
87 87
88 .. versionadded:: 1.1 88 .. versionadded:: 1.1
89 89
90 .. index:: Logging, log levels 90 .. index:: Logging, log levels, SlimerJS
91 91
92 The `casperjs` command has three available options: 92 The `casperjs` command has three available options:
93 93
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 CasperJS documentation 2 CasperJS documentation
3 ====================== 3 ======================
4 4
5 CasperJS_ is a navigation scripting & testing utility for PhantomJS_, written in Javascript. 5 CasperJS_ is a navigation scripting & testing utility for the PhantomJS_ (WebKit) and SlimerJS_ (Gecko) headless browsers, written in Javascript.
6 6
7 .. figure:: _static/images/casperjs-logo.png 7 .. figure:: _static/images/casperjs-logo.png
8 :align: right 8 :align: right
...@@ -43,3 +43,4 @@ Community ...@@ -43,3 +43,4 @@ Community
43 43
44 .. _CasperJS: http://casperjs.org/ 44 .. _CasperJS: http://casperjs.org/
45 .. _PhantomJS: http://phantomjs.org/ 45 .. _PhantomJS: http://phantomjs.org/
46 .. _SlimerJS: http://slimerjs.org/
......
...@@ -17,25 +17,13 @@ Prerequisites ...@@ -17,25 +17,13 @@ Prerequisites
17 17
18 .. versionadded:: 1.1 18 .. versionadded:: 1.1
19 19
20 - Experimental: SlimerJS_ 0.8 or greater to run your tests against Gecko (Firefox) instead of Webkit. 20 - **Experimental:** as of 1.1-beta1, SlimerJS_ 0.8 or greater to run your tests against Gecko (Firefox) instead of Webkit. To see PhantomJS API compatibility of SLimerJS, please `refer to this page <https://github.com/laurentj/slimerjs/blob/master/API_COMPAT.md>`_.
21 21
22 .. note:: 22 .. warning::
23
24 .. versionadded:: 1.0
25
26 A `Ruby <http://ruby-lang.org/>`_ version of the ``casperjs`` executable is also available in the ``rubybin/`` directory; in order to use the :index:`Ruby` version instead of the Python one:
27
28 .. code-block:: text
29
30 $ ln -sf `pwd`/rubybin/casperjs /usr/local/bin/casperjs
31 23
32 Or using the ruby interpreter: 24 .. deprecated:: 1.1
33 25
34 .. code-block:: text 26 The `Ruby <http://ruby-lang.org/>`_ version of the ``casperjs`` executable also available in the ``rubybin/`` directory has been deprecated as of 1.1-beta, and is not compatible with SLimerJS_.
35
36 $ ruby /path/to/casperjs/rubybin/casperjs
37 CasperJS version 1.1-DEV at /path/to/casperjs/rubybin/casperjs, using PhantomJS version 1.7.0
38 ...
39 27
40 .. index:: Homebrew 28 .. index:: Homebrew
41 29
...@@ -53,14 +41,13 @@ Installing from git ...@@ -53,14 +41,13 @@ Installing from git
53 41
54 Installation can be achieved using `git <http://git-scm.com/>`_. The code is mainly hosted on `Github <https://github.com/n1k0/casperjs>`_. 42 Installation can be achieved using `git <http://git-scm.com/>`_. The code is mainly hosted on `Github <https://github.com/n1k0/casperjs>`_.
55 43
56 From a stable tag 44 From the master branch
57 ~~~~~~~~~~~~~~~~~ 45 ~~~~~~~~~~~~~~~~~~~~~~
58 46
59 .. code-block:: text 47 .. code-block:: text
60 48
61 $ git clone git://github.com/n1k0/casperjs.git 49 $ git clone git://github.com/n1k0/casperjs.git
62 $ cd casperjs 50 $ cd casperjs
63 $ git checkout tags/1.0
64 $ ln -sf `pwd`/bin/casperjs /usr/local/bin/casperjs 51 $ ln -sf `pwd`/bin/casperjs /usr/local/bin/casperjs
65 52
66 Once PhantomJS and CasperJS installed on your machine, you should obtain something like this: 53 Once PhantomJS and CasperJS installed on your machine, you should obtain something like this:
...@@ -69,27 +56,18 @@ Once PhantomJS and CasperJS installed on your machine, you should obtain somethi ...@@ -69,27 +56,18 @@ Once PhantomJS and CasperJS installed on your machine, you should obtain somethi
69 56
70 $ phantomjs --version 57 $ phantomjs --version
71 1.8.2 58 1.8.2
72 $ casperjs --version 59 $ casperjs
73 1.0 60 CasperJS version 1.1.0-DEV at /Users/niko/Sites/casperjs, using phantomjs version 1.9.0
74 61 # ...
75 From the master branch
76 ~~~~~~~~~~~~~~~~~~~~~~
77
78 The ``master`` branch hosts the current development version of CasperJS.
79
80 .. code-block:: text
81
82 $ git clone git://github.com/n1k0/casperjs.git
83 $ cd casperjs
84 $ git checkout master
85 $ ln -sf `pwd`/bin/casperjs /usr/local/bin/casperjs
86 62
87 To check your current installed version: 63 Or if SlimerJS is your thing:
88 64
89 .. code-block:: text 65 .. code-block:: text
90 66
91 $ casperjs --version 67 $ slimerjs --version
92 1.1-DEV 68 Innophi SlimerJS 0.8pre, Copyright 2012-2013 Laurent Jouanneau & Innophi
69 $ casperjs
70 CasperJS version 1.1.0-DEV at /Users/niko/Sites/casperjs, using slimerjs version 0.8.0
93 71
94 You are now ready to write your :doc:`first script <quickstart>`! 72 You are now ready to write your :doc:`first script <quickstart>`!
95 73
......