Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue in travis with bundler args #19

Merged
merged 3 commits into from
Jun 12, 2020
Merged

Fix issue in travis with bundler args #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e22065
Fix issue in travis with bundler args
Cruikshanks Jun 12, 2020
9928214
Apply fix
Cruikshanks Jun 12, 2020
bd57ba4
Fix rubocop issues
Cruikshanks Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ git:

before_install:
- export TZ=UTC
- gem install -v 1.17.3 bundler --no-rdoc --no-ri
- gem install -v 1.17.3 bundler --no-document

script:
- bundle exec rubocop --format progress --format json --out rubocop-result.json
Expand Down
4 changes: 2 additions & 2 deletions spec/features/upload_file_to_bucket_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ def configure_gem
end

def stub_successful_request
stub_request(:put, %r{https:\/\/bulk-test\.s3\.eu-west-1\.amazonaws\.com\/test-bucket-load\..+})
stub_request(:put, %r{https://bulk-test\.s3\.eu-west-1\.amazonaws\.com/test-bucket-load\..+})
end

def stub_failing_request
stub_request(
:put,
%r{https:\/\/bulk-test\.s3\.eu-west-1\.amazonaws\.com\/test-bucket-load\..+}
%r{https://bulk-test\.s3\.eu-west-1\.amazonaws\.com/test-bucket-load\..+}
).to_return(
status: 403
)
Expand Down