Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit b2e168d

Browse files
committed
TEMP! Attempt to get rid of JRuby RUBYOPT trick
1 parent daa5e86 commit b2e168d

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

script/functions.sh

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,11 @@ function run_cukes {
5353

5454
echo "${PWD}/bin/cucumber"
5555

56-
if is_jruby; then
57-
# For some reason JRuby doesn't like our improved bundler setup
58-
RUBYOPT="-I${PWD}/../bundle -rbundler/setup" \
59-
PATH="${PWD}/bin:$PATH" \
60-
bin/cucumber --strict
61-
else
62-
# Prepare RUBYOPT for scenarios that are shelling out to ruby,
63-
# and PATH for those that are using `rspec` or `rake`.
64-
RUBYOPT="${RUBYOPT} -I${PWD}/../bundle -rbundler/setup" \
65-
PATH="${PWD}/bin:$PATH" \
66-
bin/cucumber --strict
67-
fi
56+
# Prepare RUBYOPT for scenarios that are shelling out to ruby,
57+
# and PATH for those that are using `rspec` or `rake`.
58+
RUBYOPT="${RUBYOPT} -I${PWD}/../bundle -rbundler/setup" \
59+
PATH="${PWD}/bin:$PATH" \
60+
bin/cucumber --strict
6861
fi
6962
}
7063

0 commit comments

Comments
 (0)