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.

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

Update simplecov and test_helper #36

Merged
merged 2 commits into from
Apr 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 lib/token_master/core.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def token_lifetime(key)
end

def required_params(key)
TokenMaster.config.required_params(key.to_sym)
TokenMaster.config.get_required_params(key.to_sym)
end

def check_manageable!(klass, key)
Expand Down
5 changes: 2 additions & 3 deletions test/test_config.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'minitest/autorun'
require 'token_master'
require 'test_helper'

describe TokenMaster::Config do
it 'has defaults' do
Expand Down Expand Up @@ -27,8 +26,8 @@

it 'when configs not set' do
config.add_tokenable_options(:invite, {})
assert_equal config.get_required_params(:invite), TokenMaster::Config::DEFAULT_VALUES[:required_params]
assert_equal config.get_token_lifetime(:invite), TokenMaster::Config::DEFAULT_VALUES[:token_lifetime]
assert_equal config.get_required_params(:invite), TokenMaster::Config::DEFAULT_VALUES[:required_params]
assert_equal config.get_token_length(:invite), TokenMaster::Config::DEFAULT_VALUES[:token_length]
end
end
Expand Down
3 changes: 1 addition & 2 deletions test/test_core.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'minitest/autorun'
require 'token_master'
require 'test_helper'

def days(duration = 1)
duration * 60 * 60 * 24
Expand Down
6 changes: 5 additions & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
require 'simplecov'
SimpleCov.start
SimpleCov.start do
add_filter './test/'
end
require 'minitest/autorun'
require 'token_master'
3 changes: 1 addition & 2 deletions test/test_model.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'minitest/autorun'
require 'token_master'
require 'test_helper'

describe TokenMaster::Model do
before do
Expand Down