tweaks to testing

rubycas · Sep 7, 2012 · cc3e228 · cc3e228
1 parent 4875816
commit cc3e228
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 86 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,6 +6,10 @@ group :tools do
   gem "simplecov", :require => false
   gem "guard"
   gem "guard-rspec"
+  gem "guard-bundler"
+  gem "fuubar"
+  gem "rb-fsevent"
+  gem "growl", :group => :darwin
 
   platforms :ruby do
     gem "sqlite3"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,111 +7,105 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
+    abstract (1.0.0)
+    actionmailer (3.0.17)
+      actionpack (= 3.0.17)
+      mail (~> 2.2.19)
+    actionpack (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.17)
+      activesupport (= 3.0.17)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+    activesupport (3.0.17)
     appraisal (0.4.1)
       bundler
       rake
-    arel (3.0.2)
-    builder (3.0.0)
-    database_cleaner (0.7.1)
+    arel (2.0.10)
+    builder (2.1.2)
+    database_cleaner (0.8.0)
     diff-lcs (1.1.3)
-    erubis (2.7.0)
-    ffi (1.1.4)
-    guard (1.3.0)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    fuubar (1.0.0)
+      rspec (~> 2.0)
+      rspec-instafail (~> 0.2.0)
+      ruby-progressbar (~> 0.0.10)
+    growl (1.0.3)
+    guard (1.3.2)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
+    guard-bundler (1.0.0)
+      bundler (~> 1.0)
+      guard (~> 1.1)
     guard-rspec (1.2.1)
       guard (>= 1.1)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.6.5)
-    listen (0.4.7)
-      rb-fchange (~> 0.0.5)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
-    mail (2.4.4)
+    i18n (0.5.0)
+    json (1.7.5)
+    listen (0.5.0)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    multi_json (1.0.4)
+    multi_json (1.3.6)
     polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.0.17)
+      actionmailer (= 3.0.17)
+      actionpack (= 3.0.17)
+      activerecord (= 3.0.17)
+      activeresource (= 3.0.17)
+      activesupport (= 3.0.17)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
-      rack-ssl (~> 1.3.2)
+      railties (= 3.0.17)
+    railties (3.0.17)
+      actionpack (= 3.0.17)
+      activesupport (= 3.0.17)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (~> 0.14.4)
     rake (0.9.2.2)
-    rb-fchange (0.0.5)
-      ffi
     rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-instafail (0.2.4)
+    rspec-mocks (2.11.2)
+    ruby-progressbar (0.0.10)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    thor (0.16.0)
-    tilt (1.3.3)
+    sqlite3 (1.3.6)
+    thor (0.14.6)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
@@ -124,12 +118,16 @@ DEPENDENCIES
   activerecord-jdbcsqlite3-adapter
   appraisal
   database_cleaner
+  fuubar
+  growl
   guard
+  guard-bundler
   guard-rspec
   jruby-openssl
   json
   rails
   rake
+  rb-fsevent
   rspec
   rubycas-client!
   simplecov

diff --git a/Guardfile b/Guardfile
@@ -1,11 +1,16 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2, :cli => '-c -f doc' do
+guard 'bundler' do
+  watch('Gemfile')
+  # Uncomment next line if Gemfile contain `gemspec' command
+   watch(/^.+\.gemspec/)
+end
+
+guard 'rspec', :version => 2, :cli => '-c -f Fuubar' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
   watch(%r{^spec/support/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch(%r{^spec/support/(.+)\.rb$})     { "spec" }
 end
-
diff --git a/lib/casclient/frameworks/rails/filter.rb b/lib/casclient/frameworks/rails/filter.rb
@@ -297,7 +297,7 @@ def single_sign_out(controller)
 
               log.debug "Intercepted single-sign-out request for CAS session #{si.inspect}."
 
-              @@client.ticket_store.process_single_sign_out(si)             
+              @@client.ticket_store.process_single_sign_out(si)
 
               # Return true to indicate that a single-sign-out request was detected
               # and that further processing of the request is unnecessary.

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -18,6 +18,9 @@
   config.mock_framework = :rspec
   config.include ActionControllerHelpers
 
+  config.filter_run_including :focus => true
+  config.run_all_when_everything_filtered = true
+
   config.before(:suite) do
     ActiveRecordHelpers.setup_active_record
     DatabaseCleaner.strategy = :transaction

diff --git a/spec/support/action_controller_helpers.rb b/spec/support/action_controller_helpers.rb
@@ -23,8 +23,10 @@ def mock_controller_with_session(request = nil, session={})
   end
 
   def mock_post_request
-      mock_request = ActionController::Request.new({})
+      mock_request = double("request")
       mock_request.stub(:post?) {true}
+      mock_request.stub(:session_options) { Hash.new }
+      mock_request.stub(:headers) { Hash.new }
       mock_request
   end
 end