Skip to content

Commit

Permalink
Merge pull request #10 from mdsol/fix/failing_build
Browse files Browse the repository at this point in the history
Fix Travis failing build
  • Loading branch information
jcarres-mdsol authored Apr 27, 2018
2 parents a15219f + 2e861f7 commit 766ab8f
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 8 deletions.
15 changes: 10 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@ cache: bundler
sudo: false

rvm:
- 2.2.5
- 2.3.1

env:
- MAUTH_CONFIG_YML=`pwd`/spec/config_root/config/mauth.yml
- 2.2.10
- 2.3.7
- 2.4.4
- 2.5.1

matrix:
include:
- rvm: 2.1.10
gemfile: gemfiles/ruby_2.1.gemfile

# https://github.com/travis-ci/travis-ci/issues/8978
before_install:
- gem update --system
- gem install bundler # https://github.com/travis-ci/travis-ci/issues/9383
- bundle --version

script: "bundle exec rspec"
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

To run tests, first run `bundle install`.

Next, run the tests with an appropriate mauth config file, typically this is done by passing the provided one using an environment variable:
Next, run the tests:

```
MAUTH_CONFIG_YML=`pwd`/spec/config_root/config/mauth.yml bundle exec rspec
bundle exec rspec
```
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MAuth Client
[![Build Status](https://travis-ci.org/mdsol/mauth-client-ruby.svg)](https://travis-ci.org/mdsol/mauth-client-ruby)
[![Build Status](https://travis-ci.org/mdsol/mauth-client-ruby.svg?branch=master)](https://travis-ci.org/mdsol/mauth-client-ruby)

This gem consists of MAuth::Client, a class to manage the information needed to both sign and authenticate requests
and responses, and middlewares for Rack and Faraday which leverage the client's capabilities.
Expand Down
9 changes: 9 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,12 @@

require 'simplecov'
SimpleCov.start

MAUTH_CONFIG_YML = File.expand_path('../config_root/config/mauth.yml', __FILE__).freeze

RSpec.configure do |config|
config.before do
allow(ENV).to receive(:[]).and_call_original
allow(ENV).to receive(:[]).with('MAUTH_CONFIG_YML').and_return(MAUTH_CONFIG_YML)
end
end

0 comments on commit 766ab8f

Please sign in to comment.