Add command-line option --splinter-webdriver-executable

[sureshvv]

For phantomjs/chrome drivers

[coveralls]

Coverage decreased (-1.58%) to 88.57% when pulling b761217 on sureshvv:master into fa4dc1e on pytest-dev:master.

[bubenkoff]

2 things:

• there are commits from unrelevant PR, which is implemented already, so please remove those
• can't it just be solved via PATH variable when running pytest?

[sureshvv]

OK.. May be not needed.

[coveralls]

Coverage increased (+0.46%) to 90.61% when pulling 740be29 on sureshvv:master into fa4dc1e on pytest-dev:master.

[bubenkoff]

please rebase to origin/master

[sureshvv]

Just learning git. Do not know about rebasing. But have made a new commit with just the changes. Let me know if any changes are needed.

[coveralls]

Coverage increased (+0.37%) to 90.52% when pulling f45fbfb on sureshvv:master into fa4dc1e on pytest-dev:master.

[bubenkoff]

run this

git remote add upstream git@github.com:pytest-dev/pytest-splinter.git
git branch --set-upstream-to=upstream/master
git checkout -b webdriver-executable
git rebase -i origin/master  # follow the instructions
git push origin webdriver-executable
# edit PR on github to use this branch

[bubenkoff]

and for future, don't do features directly on master, create branches

[blueyed]

# edit PR on github to use this branch

That's not possible. A new PR would be required.
But you can force-push it to your master.

@sureshvv
If you have your commit with only the changes already, you can also use that by cherry-picking it directly:

# Create a new branch, based on origin/master
git checkout -b splinter-webdriver-executable origin/master
# Cherry-pick the commit from your other branch
git cherry-pick fa4dc1e
# Push it to your master, overwriting what is there
git push -f sureshvv splinter-webdriver-executable:master

This will update this PR (which is using your master branch).

@bubenkoff is right in that you should always use a branch for your PRs, which makes it easier to change/rebase them.

[blueyed]

I recommend using https://github.com/github/hub btw, which provides additional commands to interface with Github.

@bubenkoff
You could also cherry-pick the commit or squash-merge them into master directly. But then it's also good for @sureshvv to learn this.. :)

[bubenkoff]

yep, that's why i tried to instruct him :)

On 12 April 2015 at 14:49, Daniel Hahler notifications@github.com wrote:

I recommend using https://github.com/github/hub btw, which provides
additional commands to interface with Github.

@bubenkoff https://github.com/bubenkoff
You could also cherry-pick the commit or squash-merge them into master
directly. But then it's also good for @sureshvv
https://github.com/sureshvv to learn this.. :)

—
Reply to this email directly or view it on GitHub
#23 (comment)
.

Anatoly Bubenkov

[sureshvv]

Another pull request with single commit has been created now.