Skip to content

Commit

Permalink
Merge pull request #13 from kucaahbe/fix_tests
Browse files Browse the repository at this point in the history
fixed random tests failing
  • Loading branch information
Dmitrij Mjakotnyi committed Mar 4, 2014
2 parents 1bb0a19 + a653c46 commit 5180c1c
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions test/shoreman_test.sh
Expand Up @@ -6,28 +6,28 @@ it_displays_usage() {
}

it_runs_simple_processes() {
output=$(bash ./shoreman.sh 'test/fixtures/simple_procfile' | head -n1)
test "$output" = "Hello"
output=$(bash ./shoreman.sh 'test/fixtures/simple_procfile'; :)
echo "$output" | grep -q "Hello"
}

it_passes_environment_variables_to_processes() {
output=$(FOO=bar bash ./shoreman.sh 'test/fixtures/environment_procfile' | head -n1)
test "$output" = "FOO = bar"
output=$(FOO=bar bash ./shoreman.sh 'test/fixtures/environment_procfile'; :)
echo "$output" | grep -q "FOO = bar"
}

it_supports_dot_env_file() {
cd "test/fixtures"
output=$(bash ../../shoreman.sh 'env_file_procfile' | head -n1)
test "$output" = "BAZ = baz"
output=$(bash ../../shoreman.sh 'env_file_procfile'; :)
echo "$output" | grep -q "BAZ = baz"
}

it_can_pass_env_file_as_second_argument() {
output=$(bash ./shoreman.sh 'test/fixtures/env_file_arg_procfile' 'test/fixtures/env_file_arg' | head -n1)
test "$output" = "MUZ = bar"
output=$(bash ./shoreman.sh 'test/fixtures/env_file_arg_procfile' 'test/fixtures/env_file_arg'; :)
echo "$output" | grep -q "MUZ = bar"
}

it_ignores_comments_in_env_file() {
cd "test/fixtures"
output=$(bash ../../shoreman.sh 'simple_procfile' 'env_file_with_comments' | head -n1)
test "$output" = "Hello"
output=$(bash ../../shoreman.sh 'simple_procfile' 'env_file_with_comments'; :)
echo "$output" | grep -q "Hello"
}

0 comments on commit 5180c1c

Please sign in to comment.