Skip to content
Browse files

attempting to fix travisCI

  • Loading branch information...
1 parent 5307fe4 commit 3eb80bb0b7e828c11b8005bba408089c64c16118 @NoamB committed
Showing with 9 additions and 9 deletions.
  1. +3 −3 sorcery.gemspec
  2. +6 −6 spec/rails3_mongoid/spec/controller_activity_logging_spec.rb
View
6 sorcery.gemspec
@@ -323,7 +323,7 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<capybara>, [">= 1.1.2"])
s.add_development_dependency(%q<mongoid>, ["~> 2.4.4"])
s.add_development_dependency(%q<timecop>, [">= 0"])
- s.add_runtime_dependency(%q<bundler>, ["= 1.1.0"])
+ s.add_runtime_dependency(%q<bundler>, [">= 1.1.0"])
s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
s.add_runtime_dependency(%q<oauth2>, ["~> 0.5.1"])
@@ -343,7 +343,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<capybara>, [">= 1.1.2"])
s.add_dependency(%q<mongoid>, ["~> 2.4.4"])
s.add_dependency(%q<timecop>, [">= 0"])
- s.add_dependency(%q<bundler>, ["= 1.1.0"])
+ s.add_dependency(%q<bundler>, [">= 1.1.0"])
s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
s.add_dependency(%q<oauth>, ["~> 0.4.4"])
s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
@@ -364,7 +364,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<capybara>, [">= 1.1.2"])
s.add_dependency(%q<mongoid>, ["~> 2.4.4"])
s.add_dependency(%q<timecop>, [">= 0"])
- s.add_dependency(%q<bundler>, ["= 1.1.0"])
+ s.add_dependency(%q<bundler>, [">= 1.1.0"])
s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
s.add_dependency(%q<oauth>, ["~> 0.4.4"])
s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
View
12 spec/rails3_mongoid/spec/controller_activity_logging_spec.rb
@@ -26,8 +26,8 @@
now = Time.now
login_user
@user.last_login_at.should_not be_nil
- @user.last_login_at.to_s(:db).should >= now.to_s(:db)
- @user.last_login_at.to_s(:db).should <= (now+2).to_s(:db)
+ @user.last_login_at.to_s.should >= now.to_s
+ @user.last_login_at.to_s.should <= (now+2).to_s
end
it "should log logout time on logout" do
@@ -35,16 +35,16 @@
now = Time.now
logout_user
User.first.last_logout_at.should_not be_nil
- User.first.last_logout_at.to_s(:db).should >= now.to_s(:db)
- User.first.last_logout_at.to_s(:db).should <= (now+2).to_s(:db)
+ User.first.last_logout_at.to_s.should >= now.to_s
+ User.first.last_logout_at.to_s.should <= (now+2).to_s
end
it "should log last activity time when logged in" do
login_user
now = Time.now
get :some_action
- User.first.last_activity_at.to_s(:db).should >= now.to_s(:db)
- User.first.last_activity_at.to_s(:db).should <= (now+2).to_s(:db)
+ User.first.last_activity_at.to_s.should >= now.to_s
+ User.first.last_activity_at.to_s.should <= (now+2).to_s
end
it "should update nothing but activity fields" do

0 comments on commit 3eb80bb

Please sign in to comment.
Something went wrong with that request. Please try again.