Skip to content

Commit

Permalink
Merge cef8970 into 9daf18c
Browse files Browse the repository at this point in the history
  • Loading branch information
Arnaud Dezandee authored and Arnaud Dezandee committed Jan 8, 2016
2 parents 9daf18c + cef8970 commit 1186e10
Show file tree
Hide file tree
Showing 113 changed files with 1,220 additions and 2,067 deletions.
22 changes: 2 additions & 20 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,2 @@
lib-cov
*.seed
*.log
*.csv
*.dat
*.out
*.pid
*.gz

pids
logs
results
build
components

node_modules
npm-debug.log

coverage
test/*.png
coverage/
dist/
11 changes: 0 additions & 11 deletions .eslintrc

This file was deleted.

23 changes: 7 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
lib-cov
*.seed
# Logs
*.log
*.csv
*.dat
*.out
*.pid
*.gz

pids
logs
results
build
components
# Coverage directory
coverage/

node_modules
npm-debug.log
# Compiled sources
dist/

coverage
test/*.png
# Dependency directory
node_modules/
20 changes: 15 additions & 5 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
coverage
test
# Logs
*.log

# Coverage directory
coverage/

# Sources
examples/
lib/
test/

# Dependency directory
node_modules/

# Dot files
.editorconfig
.eslintignore
.eslintrc
.gitignore
.travis.yml
gulpfile.js
33 changes: 14 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,35 @@
sudo: false
language: node_js
node_js:
- "5"
- "4"

env:
global:
secure: Iudzt3u8W/JujxrD9U+Z23rg3IS6mE604C/u49yvs+/8t+MwMfc1XHorIc5tHy+Uo5ViXc1sa/teRcsVFnZ5X+GzHV0Fd3TlbDRKopT4stHrRaApw1SJxUgJMMpGKU5jQnPo4E4VeDnU7tuylmX8N8rFudHg313yKi4CJsnphwQ=

addons:
firefox: "36.0"

cache:
directories:
- node_modules
firefox: "latest"

before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
# - "export DISPLAY=:99.0"
# - "sh -e /etc/init.d/xvfb start"

install:
- npm install -g webdriver-manager
- npm install -g codeclimate-test-reporter
- npm install -g coveralls
- npm install -g npm@2
- npm install
- webdriver-manager update --standalone

before_script:
- phantomjs -w > /dev/null &
- sleep 2
- webdriver-manager start > /dev/null &
- sleep 2
- npm start &
- sleep 2
# - webdriver-manager start > /dev/null &
# - sleep 2
# - npm start &
# - sleep 2

script: npm run coverage

after_script:
- cat ./coverage/lcov.info | coveralls
- codeclimate < ./coverage/lcov.info
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

branches:
only:
- master
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# CHANGELOG

## Master
* Rewrite to ES2015 and Promises
* Added step: `/^I send key "([^"]*)" in "([^"]*)" element$/`

## v1.0.2 (2015-07-27)
Expand Down
3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 AXA Group Solutions
Copyright (c) 2015 Arnaud Dezandee
Copyright (c) 2016 Arnaud Dezandee

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
39 changes: 16 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
<p align="center">
<a href="http://cucumber-mink.js.org/">
<img src="http://cucumber-mink.js.org/public/images/cucumber-mink.svg" height="80px" alt="Cucumber Mink" />
<img src="https://raw.githubusercontent.com/Adezandee/cucumber-mink/gh-pages/public/images/cucumber-mink.svg" height="80px" alt="Cucumber Mink" />
</a>
</p>

#### **[cucumber-js](https://github.com/cucumber/cucumber-js) steps dictionary.**
<p align="center">A <a href="https://github.com/cucumber/cucumber-js">cucumber-js</a> steps dictionary.</p>

[![NPM Version][npm-image]][npm-url]
[![Build Status][travis-image]][travis-url]
[![Test Coverage][coveralls-image]][coveralls-url]
[![JS.ORG][js-org-image]][js-org-url]

Run your tests with a wide range of Selenium browser: Phantomjs, Chrome, Firefox, IE
[![Dependency Status][david-image]][david-url]
[![bitHound Score][bithound-image]][bithound-url]

## Features

Run your tests with a wide range of Selenium browser: Chrome, Firefox, IE

- [Steps Dictionary (40+)](http://cucumber-mink.js.org/steps/)
- [Core API](http://cucumber-mink.js.org/api/)
Expand All @@ -20,17 +24,6 @@ Run your tests with a wide range of Selenium browser: Phantomjs, Chrome, Firefox

All documentation can be found on [cucumber-mink.js.org](http://cucumber-mink.js.org/).

## Code Quality

[![Dependency Status][david-image]][david-url]
[![Codacy Badge][codacy-image]][codacy-url]
[![Code Climate][code-climate-image]][code-climate-url]
[![bitHound Score][bithound-image]][bithound-url]

## Is it any good?

[Yes](https://news.ycombinator.com/item?id=3067434)

## Inspired

This module is inspired by PHP [Behat/MinkExtension](https://github.com/Behat/MinkExtension).
Expand All @@ -39,19 +32,19 @@ This module is inspired by PHP [Behat/MinkExtension](https://github.com/Behat/Mi

[MIT](LICENSE) © [Arnaud Dezandee](https://github.com/Adezandee)

[npm-image]: https://img.shields.io/npm/v/cucumber-mink.svg?style=flat
[npm-image]: https://img.shields.io/npm/v/cucumber-mink.svg?style=flat-square
[npm-url]: https://www.npmjs.com/package/cucumber-mink
[travis-image]: https://img.shields.io/travis/Adezandee/cucumber-mink.svg?style=flat
[travis-image]: https://img.shields.io/travis/Adezandee/cucumber-mink.svg?style=flat-square
[travis-url]: https://travis-ci.org/Adezandee/cucumber-mink
[coveralls-image]: https://img.shields.io/coveralls/Adezandee/cucumber-mink.svg?style=flat
[coveralls-image]: https://img.shields.io/coveralls/Adezandee/cucumber-mink.svg?style=flat-square
[coveralls-url]: https://coveralls.io/r/Adezandee/cucumber-mink?branch=master
[david-image]: https://img.shields.io/david/Adezandee/cucumber-mink.svg
[david-image]: https://img.shields.io/david/Adezandee/cucumber-mink.svg?style=flat-square
[david-url]: https://david-dm.org/Adezandee/cucumber-mink
[code-climate-image]: https://img.shields.io/codeclimate/github/Adezandee/cucumber-mink.svg
[code-climate-image]: https://img.shields.io/codeclimate/github/Adezandee/cucumber-mink.svg?style=flat-square
[code-climate-url]: https://codeclimate.com/github/Adezandee/cucumber-mink
[codacy-image]: https://img.shields.io/codacy/144466c7cc514f7686ef2120d41982b8.svg
[codacy-image]: https://img.shields.io/codacy/144466c7cc514f7686ef2120d41982b8.svg?style=flat-square
[codacy-url]: https://www.codacy.com/public/adezandee/cucumber-mink
[bithound-image]: https://www.bithound.io/github/Adezandee/cucumber-mink/badges/score.svg
[bithound-image]: https://www.bithound.io/github/Adezandee/cucumber-mink/badges/score.svg?style=flat-square
[bithound-url]: https://www.bithound.io/github/Adezandee/cucumber-mink
[js-org-image]: https://img.shields.io/badge/js.org-dns-ffb400.svg
[js-org-image]: https://img.shields.io/badge/js.org-dns-ffb400.svg?style=flat-square
[js-org-url]: http://js.org
2 changes: 1 addition & 1 deletion bin/cucumber-mink
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env node

require('../lib/cli/cli.js').cli();
require('../dist/cli/cli.js').cli();
32 changes: 16 additions & 16 deletions examples/browserstack.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
var mink = require('./../lib/mink');
import Mink from '../src/mink.js';

// BrowserStack
var parameters = {
const parameters = {
driver: {
desiredCapabilities: {
'browserstack.local': true,
'browserstack.debug': true,
'browser': 'Safari',
'browser_version': '8.0',
'os': 'OS X',
'os_version': 'Yosemite',
'resolution': '1280x1024'
browser: 'Safari',
browser_version: '8.0',
os: 'OS X',
os_version: 'Yosemite',
resolution: '1280x1024',
},
host: 'hub.browserstack.com',
port: 80,
user: process.env.BROWSERSTACK_USERNAME,
key: process.env.BROWSERSTACK_ACCESS_KEY,
logLevel: 'silent'
}
host: 'hub.browserstack.com',
port: 80,
user: process.env.BROWSERSTACK_USERNAME,
key: process.env.BROWSERSTACK_ACCESS_KEY,
logLevel: 'silent',
},
};

module.exports = function () {
mink.init(this, parameters);
};
export default function () {
Mink.init(this, parameters);
}
16 changes: 8 additions & 8 deletions examples/local-chrome.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
var mink = require('./../lib/mink');
import Mink from '../src/mink.js';

// Local Chrome
var parameters = {
const parameters = {
driver: {
logLevel: 'silent',
desiredCapabilities: {
browserName: 'chrome'
browserName: 'chrome',
},
port: 9515
}
port: 9515,
},
};

module.exports = function () {
mink.init(this, parameters);
};
export default function () {
Mink.init(this, parameters);
}
16 changes: 8 additions & 8 deletions examples/local-firefox.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
var mink = require('./../lib/mink');
import Mink from '../src/mink.js';

// Local Chrome
var parameters = {
const parameters = {
driver: {
logLevel: 'silent',
desiredCapabilities: {
browserName: 'firefox'
browserName: 'firefox',
},
port: 4444
}
port: 4444,
},
};

module.exports = function () {
mink.init(this, parameters);
};
export default function () {
Mink.init(this, parameters);
}
16 changes: 8 additions & 8 deletions examples/phantomjs.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
var mink = require('./../lib/mink');
import Mink from '../src/mink.js';

// Phantomjs - GhostDriver
var parameters = {
const parameters = {
driver: {
screenshotPath: 'test/',
desiredCapabilities: {
browserName: 'phantomjs'
browserName: 'phantomjs',
},
logLevel: 'silent',
port: 8910
}
port: 8910,
},
};

module.exports = function () {
mink.init(this, parameters);
};
export default function () {
Mink.init(this, parameters);
}
32 changes: 16 additions & 16 deletions examples/saucelabs.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
var mink = require('./../lib/mink');
import Mink from '../src/mink.js';

// SauceLabs
var parameters = {
const parameters = {
driver: {
desiredCapabilities: {
browserName: 'chrome',
version: '27',
platform: 'XP',
tags: ['examples'],
name: 'This is an example test'
browserName: 'chrome',
version: '27',
platform: 'XP',
tags: ['examples'],
name: 'This is an example test',
},
host: 'ondemand.saucelabs.com',
port: 80,
user: process.env.SAUCE_USERNAME,
key: process.env.SAUCE_ACCESS_KEY,
logLevel: 'silent'
}
host: 'ondemand.saucelabs.com',
port: 80,
user: process.env.SAUCE_USERNAME,
key: process.env.SAUCE_ACCESS_KEY,
logLevel: 'silent',
},
};

module.exports = function () {
mink.init(this, parameters);
};
export default function () {
Mink.init(this, parameters);
}

0 comments on commit 1186e10

Please sign in to comment.