Merge branch 'master' of github.com:onelogin/ruby-saml

Author: pitbulk

.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.5
+  - 2.2.0
   - ree
 gemfile:
   - Gemfile
@@ -13,4 +14,4 @@ matrix:
     - rvm: 1.8.7
       gemfile: Gemfile
     - rvm: ree
-      gemfile: Gemfile
+      gemfile: Gemfile

Gemfile

@@ -1,6 +1,6 @@
 #
 # Please keep this file alphabetized and organized
 #
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec

README.md

@@ -18,7 +18,7 @@ We created a demo project for Rails4 that uses the latest version of this librar
 * 1.8.7
 * 1.9.x
 * 2.1.x
-* 2.2 (not yet officially supported)
+* 2.2.0
 
 ## Adding Features, Pull Requests
 * Fork the repository

gemfiles/nokogiri-1.5.gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem "nokogiri", "~> 1.5.10"
 

test/response_test.rb

@@ -195,15 +195,23 @@ class RubySamlTest < Minitest::Test
         assert response.send(:validate_conditions, true)
       end
 
-      it "optionally allow for clock drift" do
+      it "optionally allows for clock drift" do
         # The NotBefore condition in the document is 2011-06-14T18:21:01.516Z
-        Time.stubs(:now).returns(Time.parse("2011-06-14T18:21:01Z"))
-        response = OneLogin::RubySaml::Response.new(response_document_5, :allowed_clock_drift => 0.515)
-        assert !response.send(:validate_conditions, true)
+        Timecop.freeze(Time.parse("2011-06-14T18:21:01Z")) do
+          response = OneLogin::RubySaml::Response.new(
+            response_document_5,
+            :allowed_clock_drift => 0.515
+          )
+          assert !response.send(:validate_conditions, true)
+        end
 
-        Time.stubs(:now).returns(Time.parse("2011-06-14T18:21:01Z"))
-        response = OneLogin::RubySaml::Response.new(response_document_5, :allowed_clock_drift => 0.516)
-        assert response.send(:validate_conditions, true)
+        Timecop.freeze(Time.parse("2011-06-14T18:21:01Z")) do
+          response = OneLogin::RubySaml::Response.new(
+            response_document_5,
+            :allowed_clock_drift => 0.516
+          )
+          assert response.send(:validate_conditions, true)
+        end
       end
     end
 

test/xml_security_test.rb

@@ -157,7 +157,7 @@ class XmlSecurityTest < Minitest::Test
 
         # verify our signature
         signed_doc = XMLSecurity::SignedDocument.new(request.to_s)
-        signed_doc.validate_document(ruby_saml_cert_fingerprint, false)
+        assert signed_doc.validate_document(ruby_saml_cert_fingerprint, false)
       end
 
       it "sign a LogoutRequest" do
@@ -173,7 +173,7 @@ class XmlSecurityTest < Minitest::Test
 
         # verify our signature
         signed_doc = XMLSecurity::SignedDocument.new(request.to_s)
-        signed_doc.validate_document(ruby_saml_cert_fingerprint, false)
+        assert signed_doc.validate_document(ruby_saml_cert_fingerprint, false)
       end
 
       it "sign a LogoutResponse" do
@@ -189,7 +189,7 @@ class XmlSecurityTest < Minitest::Test
 
         # verify our signature
         signed_doc = XMLSecurity::SignedDocument.new(response.to_s)
-        signed_doc.validate_document(ruby_saml_cert_fingerprint, false)
+        assert signed_doc.validate_document(ruby_saml_cert_fingerprint, false)
       end
     end