Skip to content
Open
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 .rspec
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
--format nested
--format documentation
--color
5 changes: 5 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,9 @@ appraise "rails32" do
gem "rails", "~> 3.2.8"
end

#appraise "rails42" do
# gem "rails", "~> 4.2.0"
# gem 'activerecord-session_store'#, github: 'rails/activerecord-session_store'
#end

# vim: filetype=ruby
12 changes: 11 additions & 1 deletion gemfiles/rails23.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

source "http://rubygems.org"

gem "rubysl", :platform => :rbx
gem "activesupport", "~> 2.3.11"

gemspec :path=>"../"
group :tools do
gem "guard"
gem "guard-rspec"
gem "guard-bundler"
gem "fuubar"
gem "rb-fsevent"
gem "ruby_gntp", :group => :darwin
end

gemspec :path => "../"
12 changes: 11 additions & 1 deletion gemfiles/rails30.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

source "http://rubygems.org"

gem "rubysl", :platform => :rbx
gem "rails", "~> 3.0.17"

gemspec :path=>"../"
group :tools do
gem "guard"
gem "guard-rspec"
gem "guard-bundler"
gem "fuubar"
gem "rb-fsevent"
gem "ruby_gntp", :group => :darwin
end

gemspec :path => "../"
12 changes: 11 additions & 1 deletion gemfiles/rails31.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

source "http://rubygems.org"

gem "rubysl", :platform => :rbx
gem "rails", "~> 3.1.8"

gemspec :path=>"../"
group :tools do
gem "guard"
gem "guard-rspec"
gem "guard-bundler"
gem "fuubar"
gem "rb-fsevent"
gem "ruby_gntp", :group => :darwin
end

gemspec :path => "../"
12 changes: 11 additions & 1 deletion gemfiles/rails32.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

source "http://rubygems.org"

gem "rubysl", :platform => :rbx
gem "rails", "~> 3.2.8"

gemspec :path=>"../"
group :tools do
gem "guard"
gem "guard-rspec"
gem "guard-bundler"
gem "fuubar"
gem "rb-fsevent"
gem "ruby_gntp", :group => :darwin
end

gemspec :path => "../"
2 changes: 1 addition & 1 deletion lib/casclient/frameworks/rails/filter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ def redirect_to_cas_for_authentication(controller)
end

if controller.session[:previous_redirect_to_cas] &&
controller.session[:previous_redirect_to_cas] > (Time.now - 1.second)
controller.session[:previous_redirect_to_cas].to_time > (Time.now - 1.second)
log.warn("Previous redirect to the CAS server was less than a second ago. The client at #{controller.request.remote_ip.inspect} may be stuck in a redirection loop!")
controller.session[:cas_validation_retry_count] ||= 0

Expand Down
6 changes: 3 additions & 3 deletions spec/casclient/client_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@
context "cas server is up" do
it "returns false if the server cannot be connected to" do
connection.stub(:get).and_raise(Errno::ECONNREFUSED)
client.cas_server_is_up?.should be_false
client.cas_server_is_up?.should be false
end

it "returns false if the request was not a success" do
response.stub :kind_of? => false
client.cas_server_is_up?.should be_false
client.cas_server_is_up?.should be false
end

it "returns true when the server is running" do
response.stub :kind_of? => true
client.cas_server_is_up?.should be_true
client.cas_server_is_up?.should be true
end
end

Expand Down