Skip to content

Commit

Permalink
Fix specs
Browse files Browse the repository at this point in the history
  • Loading branch information
Pablo Cantero committed Mar 11, 2017
1 parent c96f218 commit e006790
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/shoryuken/environment_loader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def load_rails
end

def merge_cli_defined_queues
cli_defined_queues = options[:queues]
cli_defined_queues = options[:queues].to_a

cli_defined_queues.each do |cli_defined_queue|
# CLI defined queues override config_file defined queues
Expand Down
3 changes: 2 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ def perform(sqs_msg, body); end

RSpec.configure do |config|
# Only run slow tests if SPEC_ALL=true and AWS_ACCESS_KEY_ID is present
# The AWS_ACCESS_KEY_ID checker is because Travis CI does not expose ENV variables to pull requests from forked repositories
# The AWS_ACCESS_KEY_ID checker is because Travis CI
# does not expose ENV variables to pull requests from forked repositories
# http://docs.travis-ci.com/user/pull-requests/
config.filter_run_excluding slow: true if ENV['SPEC_ALL'] != 'true' || ENV['AWS_ACCESS_KEY_ID'].nil?

Expand Down

0 comments on commit e006790

Please sign in to comment.