diff --git a/.travis.yml b/.travis.yml index 35a1611..650dde8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,19 @@ +before_install: + - "echo DAMN I LOVE YOU JOSH" + - envgemfile: + - gemfiles/rails-3.gemfile + - gemfiles/rails-3-1.gemfile + - gemfiles/rails-3-2.gemfile + language: ruby +env: + - DEV=ACADEMY + - DEV=FAILE + +before_install: + - echo $DEV + rvm: - 1.9.3 - 2.0.0 @@ -9,8 +23,12 @@ rvm: - jruby - rbx -gemfile: - - gemfiles/rails-3.gemfile - - gemfiles/rails-3-1.gemfile +matrix: + allow_failures: + - rvm: 2.1 + - rvm: 2.2 + - rvm: ruby-head + - rvm: rbx + +sudo: false -sudo: false \ No newline at end of file diff --git a/Appraisals b/Appraisals index e257842..0a6fcf9 100644 --- a/Appraisals +++ b/Appraisals @@ -4,4 +4,8 @@ end appraise "rails-3-1" do gem "activemodel", "~> 3.1.0" -end \ No newline at end of file +end + +appraise "rails-3-2" do + gem "activemodel", "~> 3.2.0" +end diff --git a/gemfiles/rails-3-2.gemfile b/gemfiles/rails-3-2.gemfile new file mode 100644 index 0000000..c8fb2ec --- /dev/null +++ b/gemfiles/rails-3-2.gemfile @@ -0,0 +1,10 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "activemodel", "~> 3.2.0" +gem "rake", "~> 0.8.7" +gem "shoulda", "~> 2.11.3" +gem "mocha", "~> 0.9.8" +gem "appraisal" + diff --git a/test/scoring_test.rb b/test/scoring_test.rb index edbddca..8b5d88a 100644 --- a/test/scoring_test.rb +++ b/test/scoring_test.rb @@ -40,6 +40,10 @@ class ScoringTest < Test::Unit::TestCase assert_equal 20, @st.completeness_score end + should "not have an absolute completeness score of 30" do + assert_not_equal 30, @st.completeness_score + end + should "have a relative completeness score of 0 (percent complete)" do assert_equal 100, @st.percent_complete end diff --git a/test/test_helper.rb b/test/test_helper.rb index b72e164..82e7f10 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,9 +1,3 @@ -begin - require 'bundler/setup' -rescue LoadError - puts 'although not required, its recommended you use bundler when running the tests' -end - require 'test/unit' require 'shoulda' require 'mocha'