Skip to content

Commit

Permalink
Merge pull request #390 from cucumber/feature/rename-cli-app
Browse files Browse the repository at this point in the history
Rename bin/cli to bin/aruba-test-cli to prevent name conflict
  • Loading branch information
Dennis Günnewig committed May 9, 2016
2 parents 081d37d + faa67e9 commit 700322f
Show file tree
Hide file tree
Showing 35 changed files with 147 additions and 147 deletions.
2 changes: 1 addition & 1 deletion features/api/command/last_command_stopped.feature
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Feature: Return last command stopped

@requires-aruba-version-1
Scenario: No command has been stopped
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
while [ true ]; do sleep 1; done
Expand Down
30 changes: 15 additions & 15 deletions features/api/command/run.feature
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Feature: Run command
Given I use a fixture named "cli-app"

Scenario: Existing executable
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
exit 0
Expand All @@ -42,7 +42,7 @@ Feature: Run command
Then the specs should all pass

Scenario: Relative path to executable
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
exit 0
Expand All @@ -52,15 +52,15 @@ Feature: Run command
require 'spec_helper'
RSpec.describe 'Run command', :type => :aruba do
before(:each) { run('bin/cli') }
before(:each) { run('bin/aruba-test-cli') }
it { expect(last_command_started).to be_successfully_executed }
end
"""
When I run `rspec`
Then the specs should all pass

Scenario: Non-existing executable
Given a file named "bin/cli" does not exist
Given a file named "bin/aruba-test-cli" does not exist
And a file named "spec/run_spec.rb" with:
"""ruby
require 'spec_helper'
Expand All @@ -79,7 +79,7 @@ Feature: Run command
Otherwise methods like `#send_signal` don't work since they require the
command to be running and have setup it's signal handler.

Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/usr/bin/env bash
Expand Down Expand Up @@ -129,7 +129,7 @@ Feature: Run command
If you have got a "long running" command, you should consider using the
`exit_timeout`-option.

Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/usr/bin/env bash
Expand Down Expand Up @@ -159,7 +159,7 @@ Feature: Run command
If you commands with a long and short startup phases, you should consider
using the `startup_wait_time`-option local to the `#run`-call.

Given an executable named "bin/cli1" with:
Given an executable named "bin/aruba-test-cli1" with:
"""bash
#!/usr/bin/env bash
Expand Down Expand Up @@ -187,7 +187,7 @@ Feature: Run command
while [ true ]; do sleep 0.2; done
"""
And an executable named "bin/cli2" with:
And an executable named "bin/aruba-test-cli2" with:
"""bash
#!/usr/bin/env bash
Expand Down Expand Up @@ -238,7 +238,7 @@ Feature: Run command
If you commands with a long and short startup phases, you should consider
using the `startup_wait_time`-option local to the `#run`-call.

Given an executable named "bin/cli1" with:
Given an executable named "bin/aruba-test-cli1" with:
"""bash
#!/usr/bin/env bash
Expand Down Expand Up @@ -266,7 +266,7 @@ Feature: Run command
while [ true ]; do sleep 0.2; done
"""
And an executable named "bin/cli2" with:
And an executable named "bin/aruba-test-cli2" with:
"""bash
#!/usr/bin/env bash
Expand Down Expand Up @@ -317,7 +317,7 @@ Feature: Run command
If need to mix "long running" and "short running" commands, you should consider using the
`exit_timeout`-option local to the `#run`-method.

Given an executable named "bin/cli1" with:
Given an executable named "bin/aruba-test-cli1" with:
"""bash
#!/usr/bin/env bash
Expand All @@ -328,7 +328,7 @@ Feature: Run command
do_some_work
"""
And an executable named "bin/cli2" with:
And an executable named "bin/aruba-test-cli2" with:
"""bash
#!/usr/bin/env bash
Expand Down Expand Up @@ -358,7 +358,7 @@ Feature: Run command
If need to mix "long running" and "short running" commands, you should consider using the
`exit_timeout`-option local to the `#run`-method.

Given an executable named "bin/cli1" with:
Given an executable named "bin/aruba-test-cli1" with:
"""bash
#!/usr/bin/env bash
Expand All @@ -369,7 +369,7 @@ Feature: Run command
do_some_work
"""
And an executable named "bin/cli2" with:
And an executable named "bin/aruba-test-cli2" with:
"""bash
#!/usr/bin/env bash
Expand All @@ -395,7 +395,7 @@ Feature: Run command
Then the specs should all pass

Scenario: Starting command twice fails
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
exit 0
Expand Down
18 changes: 9 additions & 9 deletions features/api/command/run_simple.feature
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Feature: Run command in a simpler fashion
Given I use a fixture named "cli-app"

Scenario: Require executable to succeed (by default value)
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
exit 1
Expand All @@ -30,7 +30,7 @@ Feature: Run command in a simpler fashion
Then the specs should all pass

Scenario: Require executable to succeed (set by option)
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
exit 1
Expand All @@ -47,7 +47,7 @@ Feature: Run command in a simpler fashion
Then the specs should all pass

Scenario: Require executable to succeed (set by option, deprecated)
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
exit 1
Expand All @@ -64,7 +64,7 @@ Feature: Run command in a simpler fashion
Then the specs should all pass

Scenario: Ignore failure of executable (set by option)
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
exit 1
Expand All @@ -81,7 +81,7 @@ Feature: Run command in a simpler fashion
Then the specs should all pass

Scenario: Ignore failure of executable (set by option, deprecated)
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
exit 1
Expand All @@ -104,7 +104,7 @@ Feature: Run command in a simpler fashion
Otherwise methods like `#send_signal` don't work since they require the
command to be running and have setup it's signal handler.

Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/usr/bin/env bash
Expand Down Expand Up @@ -140,7 +140,7 @@ Feature: Run command in a simpler fashion
If you have got a "long running" command, you should consider using the
`exit_timeout`-option.

Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/usr/bin/env bash
Expand Down Expand Up @@ -171,7 +171,7 @@ Feature: Run command in a simpler fashion
`#run_simple()` does not make sense. The command is stopped internally when
its exit status is checked.

Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/usr/bin/env bash
Expand Down Expand Up @@ -208,7 +208,7 @@ Feature: Run command in a simpler fashion

Scenario: Activate announcer channels on failure

Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
echo "Hello, I'm STDOUT"
Expand Down
4 changes: 2 additions & 2 deletions features/api/command/send_signal.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Feature: Send running command a signal
Given I use a fixture named "cli-app"

Scenario: Existing executable
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""ruby
#!/usr/bin/env bash
Expand All @@ -35,7 +35,7 @@ Feature: Send running command a signal
Then the specs should all pass

Scenario: Dying command
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""ruby
#!/usr/bin/env bash
exit 1
Expand Down
4 changes: 2 additions & 2 deletions features/api/command/stderr.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Feature: Access STDERR of command
And the default aruba io wait timeout is 1 seconds

Scenario: Existing executable
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
echo 'Hello, Aruba!' >&2
Expand All @@ -27,7 +27,7 @@ Feature: Access STDERR of command
Then the specs should all pass

Scenario: Waiting for output to "appear" after 2 seconds
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions features/api/command/stdout.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Feature: Access STDOUT of command
And the default aruba io wait timeout is 1 seconds

Scenario: Existing executable
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
echo 'Hello, Aruba!'
Expand All @@ -27,7 +27,7 @@ Feature: Access STDOUT of command
Then the specs should all pass

Scenario: Waiting for output to "appear" after 2 seconds
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
sleep 1
Expand Down
8 changes: 4 additions & 4 deletions features/api/command/stop.feature
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Feature: Stop command
Given I use a fixture named "cli-app"

Scenario: Stop command started last
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
function term {
Expand All @@ -37,7 +37,7 @@ Feature: Stop command
Then the specs should all pass

Scenario: Find and stop command
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
function term {
Expand All @@ -61,7 +61,7 @@ Feature: Stop command
Then the specs should all pass

Scenario: Stop successful command with configured signal
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
function hup {
Expand Down Expand Up @@ -96,7 +96,7 @@ Feature: Stop command
Then the specs should all pass

Scenario: Stop unsuccessful command with configured signal
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
function hup {
Expand Down
4 changes: 2 additions & 2 deletions features/api/command/stop_all_commands.feature
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Feature: Stop all commands
Given I use a fixture named "cli-app"

Scenario: Multiple commands are running
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
sleep 3
Expand All @@ -28,7 +28,7 @@ Feature: Stop all commands
Then the specs should all pass

Scenario: Stop all commands for which the block returns true
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions features/api/command/terminate_all_commands.feature
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Feature: Terminate all commands
Given I use a fixture named "cli-app"

Scenario: Multiple commands are running
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
sleep 3
Expand All @@ -28,7 +28,7 @@ Feature: Terminate all commands
Then the specs should all pass

Scenario: Terminate all commands for which the block returns true
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
sleep 1
Expand Down
6 changes: 3 additions & 3 deletions features/api/command/which.feature
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Feature: Get path to command
Given I use a fixture named "cli-app"

Scenario: Existing executable
Given an executable named "bin/cli" with:
Given an executable named "bin/aruba-test-cli" with:
"""bash
#!/bin/bash
exit 0
Expand All @@ -17,14 +17,14 @@ Feature: Get path to command
require 'spec_helper'
RSpec.describe 'Find path for command', :type => :aruba do
it { expect(which('cli')).to match %r{tmp/aruba/cli-app/bin/cli} }
it { expect(which('cli')).to match %r{tmp/aruba/cli-app/bin/aruba-test-cli} }
end
"""
When I run `rspec`
Then the specs should all pass

Scenario: Non-existing executable
Given a file named "bin/cli" does not exist
Given a file named "bin/aruba-test-cli" does not exist
And a file named "spec/which_spec.rb" with:
"""ruby
require 'spec_helper'
Expand Down
Loading

0 comments on commit 700322f

Please sign in to comment.