Skip to content

Commit

Permalink
Merge pull request #136 from omniauth/chores-2020-01-11
Browse files Browse the repository at this point in the history
Chores 2020 01 11
  • Loading branch information
BobbyMcWho committed Jan 12, 2021
2 parents 6652078 + 9fc3733 commit d91bf57
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 28 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/main.yml
Expand Up @@ -47,3 +47,21 @@ jobs:
env:
JRUBY_OPTS: --debug
run: bundle exec rake
coveralls:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
bundler-cache: true
- name: Install dependencies
run: bundle install
- name: Run tests
run: bundle exec rake
- name: Coveralls GitHub Action
uses: coverallsapp/github-action@v1.1.2
with:
github-token: ${{ secrets.github_token }}
path-to-lcov: './coverage/lcov/omniauth-oauth2.lcov'
22 changes: 0 additions & 22 deletions .travis.yml

This file was deleted.

5 changes: 3 additions & 2 deletions Gemfile
Expand Up @@ -4,14 +4,15 @@ gem "rake", "~> 12.0"

group :test do
gem "addressable", "~> 2.3.8", :platforms => %i[jruby ruby_18]
gem "coveralls"
gem 'coveralls_reborn', '~> 0.19.0', require: false
gem "json", :platforms => %i[jruby ruby_18 ruby_19]
gem "mime-types", "~> 1.25", :platforms => %i[jruby ruby_18]
gem "rack-test"
gem "rest-client", "~> 1.8.0", :platforms => %i[jruby ruby_18]
gem "rspec", "~> 3.2"
gem "rubocop", ">= 0.51", :platforms => %i[ruby_19 ruby_20 ruby_21 ruby_22 ruby_23 ruby_24]
gem "simplecov", ">= 0.9"
gem 'simplecov-lcov'
gem 'tins', '~> 1.13', :platforms => %i[jruby_18 jruby_19 ruby_19]
gem "webmock", "~> 3.0"
end

Expand Down
4 changes: 1 addition & 3 deletions README.md
@@ -1,13 +1,11 @@
# OmniAuth OAuth2

[![Gem Version](http://img.shields.io/gem/v/omniauth-oauth2.svg)][gem]
[![Build Status](http://img.shields.io/travis/omniauth/omniauth-oauth2.svg)][travis]
[![Code Climate](http://img.shields.io/codeclimate/maintainability/intridea/omniauth-oauth2.svg)][codeclimate]
[![Coverage Status](http://img.shields.io/coveralls/intridea/omniauth-oauth2.svg)][coveralls]
[![Security](https://hakiri.io/github/omniauth/omniauth-oauth2/master.svg)](https://hakiri.io/github/omniauth/omniauth-oauth2/master)

[gem]: https://rubygems.org/gems/omniauth-oauth2
[travis]: http://travis-ci.org/omniauth/omniauth-oauth2
[codeclimate]: https://codeclimate.com/github/intridea/omniauth-oauth2
[coveralls]: https://coveralls.io/r/intridea/omniauth-oauth2

Expand All @@ -32,7 +30,7 @@ module OmniAuth
# This is where you pass the options you would pass when
# initializing your consumer from the OAuth gem.
option :client_options, {:site => "https://api.somesite.com"}

# You may specify that your strategy should use PKCE by setting
# the pkce option to true: https://tools.ietf.org/html/rfc7636
option :pkce, true
Expand Down
9 changes: 8 additions & 1 deletion spec/helper.rb
Expand Up @@ -3,9 +3,16 @@

if RUBY_VERSION >= "1.9"
require "simplecov"
require "simplecov-lcov"
require "coveralls"

SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true

SimpleCov.formatters = [
SimpleCov::Formatter::HTMLFormatter,
SimpleCov::Formatter::LcovFormatter,
Coveralls::SimpleCov::Formatter
]

SimpleCov.start do
minimum_coverage(78.48)
Expand Down

0 comments on commit d91bf57

Please sign in to comment.