diff --git a/.travis.yml b/.travis.yml index 66384c1..3881e4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ sudo: required +dist: trusty language: node_js after_success: npm run coverage && cat ./coverage/lcov.info | coveralls node_js: @@ -8,6 +9,17 @@ node_js: - "4" - "5.0" - "5" + - "stable" +addons: + # From some tests it seems you can only have one firefox addon. + # Adding two results in the last one defined being the one installed. + firefox: latest + apt: + sources: + - google-chrome + packages: + - google-chrome-stable + - google-chrome-beta env: - NPM_VERSION=3 - NPM_VERSION=2 @@ -25,10 +37,7 @@ script: - npm run coverage - ./runTests.sh before_install: - - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - - - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' - - sudo apt-get update - - sudo apt-get install google-chrome-stable + - sudo apt-get update -qq - npm install -g npm@$NPM_VERSION before_script: - npm install -g jshint diff --git a/README.md b/README.md index e9783ae..1791081 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,6 @@ [![Build Status](https://travis-ci.org/hypery2k/galenframework-cli.svg?branch=master)](https://travis-ci.org/hypery2k/galenframework-cli) [![Build status](https://ci.appveyor.com/api/projects/status/fbwy88pc9ia6429w/branch/master?svg=true)](https://ci.appveyor.com/project/hypery2k/galenframework-cli/branch/master) [![License](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE) -[![Dependency Status](https://david-dm.org/hypery2k/galenframework-cli.svg)](https://david-dm.org/hypery2k/galenframework-cli) [![devDependency Status](https://david-dm.org/hypery2k/galenframework-cli/dev-status.svg)](https://david-dm.org/hypery2k/galenframework-cli#info=devDependencies)[![Coverage Status](https://coveralls.io/repos/hypery2k/galenframework-cli/badge.svg?branch=master&service=github)](https://coveralls.io/github/hypery2k/galenframework-cli?branch=master) - - The [core](core/) module is just the node wrapper for [Galen](http://galenframework.com) and can be used within CI environments The [CLI](cli/) module is a command line module for [Galen](http://galenframework.com). This includes the core above and webdriver downloads for different browsers. diff --git a/cli/README.MD b/cli/README.MD index 4c3239f..42418bb 100644 --- a/cli/README.MD +++ b/cli/README.MD @@ -8,6 +8,8 @@ [![NPM](https://nodei.co/npm/galenframework-cli.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/galenframework-cli/) +[![Dependency Status](https://david-dm.org/hypery2k/galenframework-cli.svg)](https://david-dm.org/hypery2k/galenframework-cli) [![devDependency Status](https://david-dm.org/hypery2k/galenframework-cli/dev-status.svg)](https://david-dm.org/hypery2k/galenframework-cli#info=devDependencies)[![Coverage Status](https://coveralls.io/repos/hypery2k/galenframework-cli/badge.svg?branch=master&service=github)](https://coveralls.io/github/hypery2k/galenframework-cli?branch=master) + ## Installation You must have Java 6+ installed. diff --git a/cli/package.json b/cli/package.json index 58db521..4778fe4 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,6 +1,6 @@ { "name": "galenframework-cli", - "version": "2.3.0", + "version": "2.2.5", "description": "Just the node wrapper for the Galen Framework.", "homepage": "https://github.com/hypery2k/galenframework-cli", "bugs": { @@ -32,7 +32,7 @@ "dependencies": { "chromedriver": "*", "fs-extra": "0.26.2", - "galenframework": "2.2.4", + "galenframework": "2.2.5", "httpreq": "0.4.13", "kew": "0.7.0", "npmconf": "2.1.2", diff --git a/core/README.MD b/core/README.MD index 380fe81..23ce001 100644 --- a/core/README.MD +++ b/core/README.MD @@ -4,10 +4,13 @@ > Just the node wrapper for [Galen](http://galenframework.com). + [![License](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE) [![npm version](https://badge.fury.io/js/galenframework.svg)](http://badge.fury.io/js/galenframework) [![NPM](https://nodei.co/npm/galenframework.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/galenframework/) +[![Dependency Status](https://david-dm.org/hypery2k/galenframework.svg)](https://david-dm.org/hypery2k/galenframework) [![devDependency Status](https://david-dm.org/hypery2k/galenframework/dev-status.svg)](https://david-dm.org/hypery2k/galenframework#info=devDependencies)[![Coverage Status](https://coveralls.io/repos/hypery2k/galenframework/badge.svg?branch=master&service=github)](https://coveralls.io/github/hypery2k/galenframework?branch=master) + If you want to install Galen as CLI command install the [CLI-module](https://www.npmjs.com/package/galenframework-cli) ## Installation diff --git a/core/package.json b/core/package.json index 9714947..7d81aff 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "galenframework", - "version": "2.2.4", + "version": "2.2.5", "description": "The command line tool to use the Galen Framework. This includes the wrapper above and webdriver downloads for different browsers", "homepage": "https://github.com/hypery2k/galenframework-cli", "bugs": { @@ -52,7 +52,7 @@ "url": "git+https://github.com/hypery2k/galenframework-cli.git" }, "license": "MIT", - "_galenVersion": "2.2.4", + "_galenVersion": "2.2.5", "_npmVersion": "2.6.0", "_nodeVersion": "1.4.1" }