Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Squashed commit of the following:

commit 59d63722bd3329ab66e9aae28f6111d207bcaa13
Merge: 6a64c03 90ba5e9
Author: Bob Silverberg <bob.silverberg@gmail.com>
Date:   Mon Dec 2 21:39:22 2013 -0500

    Merge branch 'master' of https://github.com/ersuniljoshi/mcom-tests into pr225

commit 90ba5e9
Merge: 5be86d9 2436173
Author: Sunil Joshi <joshi_sunil@in.com>
Date:   Mon Aug 12 23:10:33 2013 +0530

    Merge branch 'master' of https://github.com/ersuniljoshi/mcom-tests

commit 5be86d9
Author: Sunil Joshi <joshi_sunil@in.com>
Date:   Sun Aug 11 14:38:14 2013 +0530

    Fix Issue #203

    Updating Readme file to fix Issue #203

commit 2436173
Author: Sunil Joshi <joshi_sunil@in.com>
Date:   Sun Aug 11 14:38:14 2013 +0530

    Fix Issue #203
  • Loading branch information...
commit 32627ca15ef2d60cf5f844dfb4fd7cd1543c23a0 1 parent 6a64c03
@bobsilverberg bobsilverberg authored
Showing with 9 additions and 58 deletions.
  1. +9 −58 README.md
View
67 README.md
@@ -8,11 +8,6 @@ This repository holds automated tests for [http://www.mozilla.org][MOZ]
Running Tests
-------------
-### Java
-You will need a version of the [Java Runtime Environment][JRE] installed
-
-[JRE]: http://www.oracle.com/technetwork/java/javase/downloads/index.html
-
### Python
Before you will be able to run these tests you will need to have Python 2.6 installed.
@@ -44,23 +39,13 @@ If you are running on Ubuntu/Debian you will need to first do
to install the required Python libraries.
-### Selenium
-Once this is all set up, you will need to download and start a Selenium server. You can download the latest Selenium server from [here][Selenium Downloads]. The filename will be something like 'selenium-server-standalone-x.x.jar (where x.x is current shipping version)'
-
-To start the Selenium server run the following command:
-
- java -jar ~/Downloads/selenium-server-standalone-x.x.jar (where x.x is current shipping version)
+### Running tests locally
-Change the path/name to the downloaded Selenium server file.
+To run tests locally, it's a simple case of calling the command below from this directory
-[Selenium Downloads]: http://code.google.com/p/selenium/downloads/list
+ py.test --driver=firefox
-
-
-Once the above prerequisites have been met you can run the tests using the
-following command:
-
- py.test --driver=firefox --destructive
+For more command line options, see https://github.com/davehunt/pytest-mozwebqa
Writing Tests
-------------
@@ -78,44 +63,10 @@ we'd like to ask you to do:
License
-------
-This software is licensed under the [Mozilla Tri-License][MPL]:
-
- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla WebQA Selenium Tests.
-
- The Initial Developer of the Original Code is Mozilla.
- Portions created by the Initial Developer are Copyright (C) 2011
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK *****
-
-[MPL]: http://www.mozilla.org/MPL/
+This software is licensed under the [MPL] 2.0:
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+[MPL]: http://www.mozilla.org/MPL/2.0/
Please sign in to comment.
Something went wrong with that request. Please try again.