Pistos-ramaze 2009.04.08 → 2009.06.12

data/spec/contrib/rest.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../spec/helper', __FILE__)
 require 'ramaze/contrib/rest'
 
 class Posts < Ramaze::Controller
@@ -13,7 +13,7 @@ class Posts < Ramaze::Controller
 end
 
 describe 'Contrib REST rewrite' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it('rewrites GET to show'){          get('/').body.should == 'Showing' }
   it('rewrites POST to create'){      post('/').body.should == 'Creating' }

data/spec/examples/caching.rb

@@ -1,18 +1,16 @@
-require 'spec/helper'
-require 'examples/helpers/cache'
+require File.expand_path('../../../spec/helper', __FILE__)
+require File.expand_path('../../../examples/helpers/cache', __FILE__)
 
 describe 'Caching' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it '/' do
     3.times do
-      lambda{ get('/') }.
-        should.not.change{ get('/').body }
+      lambda{ get('/') }.should.not.change{ get('/').body }
     end
 
     3.times do
-      lambda{ get('/invalidate') }.
-        should.change{ get('/').body }
+      lambda{ get('/invalidate') }.should.change{ get('/').body }
     end
   end
 end

data/spec/examples/css.rb

@@ -1,9 +1,9 @@
-require 'spec/helper'
+require File.expand_path('../../../spec/helper', __FILE__)
 spec_require 'haml'
-require 'examples/misc/css'
+require File.expand_path('../../../examples/misc/css', __FILE__)
 
 describe 'CSSController' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   def req(path) r = get(path); [r.content_type, r.body] end
 

data/spec/examples/element.rb

@@ -1,8 +1,9 @@
-require 'spec/helper'
-require 'examples/basic/element'
+require File.expand_path('../../../spec/helper', __FILE__)
+spec_require 'nagoro'
+require File.expand_path('../../../examples/basic/element', __FILE__)
 
 describe 'Element' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it '/' do
     r = get('/').body

data/spec/examples/hello.rb

@@ -1,8 +1,8 @@
-require 'spec/helper'
-require 'examples/basic/hello'
+require File.expand_path('../../../spec/helper', __FILE__)
+require File.expand_path('../../../examples/basic/hello', __FILE__)
 
 describe 'Hello' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'serves the index page' do
     get('/').body.should == 'Hello, World!'

data/spec/examples/helpers/httpdigest.rb

@@ -1,89 +1,64 @@
-require 'spec/helper'
-require 'examples/helpers/httpdigest'
+require File.expand_path('../../../../spec/helper', __FILE__)
+require File.expand_path('../../../../examples/helpers/httpdigest', __FILE__)
 
-class MockDigestRequest
-  def initialize(params)
-    @params = params
-  end
-
-  def method_missing(sym)
-    if @params.has_key? k = sym.to_s
-      return @params[k]
-    end
-    super
-  end
-
-  def method
-    @params['method']
-  end
-
-  def response(password)
-    Rack::Auth::Digest::MD5.new(nil).send(:digest, self, password)
-  end
-end
+# Not sure if we should change the behaviour of digest_authorize, it keeps
+# challenging the authorization even after a logout, which will log us in right
+# away again.
+#
+# IMHO, digest_authorize should only be valid for the following request.
+#
+# So for now, we have to reset the values of @digest_username and
+# @digest_password before we make a request.
 
 describe Ramaze::Helper do
-  behaves_like :session
-
-  def auth_for(got, uri, username, password)
-    challenge = got['WWW-Authenticate'].split(' ', 2).last
-    params = Rack::Auth::Digest::Params.parse(challenge)
-    params.merge!('cnonce' => 'nonsensenonce', 'method' => 'GET',
-                  'nc' => '00000001', 'uri' => uri, 'username' => username)
-    params['response'] = MockDigestRequest.new(params).response(password)
-
-    "Digest #{params}"
-  end
+  behaves_like :rack_test
 
   it 'authorizes request for /eyes_only' do
-    session do |mock|
-      got = mock.get('/eyes_only')
-      got.status.should == 401
-      got.body.should == 'Unauthorized'
+    digest_authorize nil, nil
+    get '/eyes_only'
+    last_response.status.should == 401
+    last_response.body.should == "Unauthorized"
 
-      auth = auth_for(got, '/eyes_only', 'foo', 'oof')
-      got = mock.get('/eyes_only', 'HTTP_AUTHORIZATION' => auth)
-      got.status.should == 200
-      got.body.should == "Shhhh don't tell anyone"
-    end
+    digest_authorize 'foo', 'oof'
+    get '/eyes_only'
+    last_response.status.should == 200
+    last_response.body.should == "Shhhh don't tell anyone"
   end
 
   it 'authorizes request for /secret as admin' do
-    session do |mock|
-      got = mock.get('/secret')
-      got.status.should == 401
-      got.body.should == 'Unauthorized'
+    digest_authorize nil, nil
+    get '/secret'
+    last_response.status.should == 401
+    last_response.body.should == 'Unauthorized'
+
+    digest_authorize 'admin', 'secret'
+    get '/secret'
 
-      auth = auth_for(got, '/secret', 'admin', 'secret')
-      got = mock.get('/secret', 'HTTP_AUTHORIZATION' => auth)
-      got.status.should == 200
-      got.body.should == "Hello <em>admin</em>, welcome to SECRET world."
-    end
+    last_response.status.should == 200
+    last_response.body.should == "Hello <em>admin</em>, welcome to SECRET world."
   end
 
   it 'authorizes request for /secret as root' do
-    session do |mock|
-      got = mock.get('/secret')
-      got.status.should == 401
-      got.body.should == 'Unauthorized'
+    digest_authorize nil, nil
+    get '/secret'
+    last_response.status.should == 401
+    last_response.body.should == 'Unauthorized'
 
-      auth = auth_for(got, '/secret', 'root', 'password')
-      got = mock.get('/secret', 'HTTP_AUTHORIZATION' => auth)
-      got.status.should == 200
-      got.body.should == "Hello <em>root</em>, welcome to SECRET world."
-    end
+    digest_authorize 'root', 'password'
+    get '/secret'
+    last_response.status.should == 200
+    last_response.body.should == "Hello <em>root</em>, welcome to SECRET world."
   end
 
   it 'authorizes request for /guest' do
-    session do |mock|
-      got = mock.get('/guest')
-      got.status.should == 401
-      got.body.should == 'Unauthorized'
+    digest_authorize nil, nil
+    get '/guest'
+    last_response.status.should == 401
+    last_response.body.should == 'Unauthorized'
 
-      auth = auth_for(got, '/guest', 'guest', 'access')
-      got = mock.get('/guest', 'HTTP_AUTHORIZATION' => auth)
-      got.status.should == 200
-      got.body.should == "Hello <em>guest</em>, welcome to GUEST world."
-    end
+    digest_authorize 'guest', 'access'
+    get '/guest'
+    last_response.status.should == 200
+    last_response.body.should == "Hello <em>guest</em>, welcome to GUEST world."
   end
 end

data/spec/examples/linking.rb

@@ -1,8 +1,8 @@
-require 'spec/helper'
-require 'examples/basic/linking'
+require File.expand_path('../../../spec/helper', __FILE__)
+require File.expand_path('../../../examples/basic/linking', __FILE__)
 
 describe 'Linking' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'should provide a link to help' do
     r = get('/').body

data/spec/examples/simple.rb

@@ -1,8 +1,8 @@
-require 'spec/helper'
-require 'examples/basic/simple'
+require File.expand_path('../../../spec/helper', __FILE__)
+require File.expand_path('../../../examples/basic/simple', __FILE__)
 
 describe 'Simple' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   def check(url)
     response = get(url)

data/spec/examples/templates/template_erubis.rb

@@ -1,9 +1,13 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'erubis'
-require 'examples/templates/template_erubis'
+require File.expand_path('../../../../examples/templates/template_erubis', __FILE__)
 
-describe 'Template Erubis' do |describe|
-  ::Ramaze::Spec::Examples::Templates.tests( describe, 'Erubis' )
+describe 'Template Erubis' do
+  behaves_like :template_spec
+  spec_template 'Erubis'
 end

data/spec/examples/templates/template_ezamar.rb

@@ -1,8 +1,13 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
-require 'examples/templates/template_ezamar'
+spec_require 'ezamar'
+require File.expand_path('../../../../examples/templates/template_ezamar', __FILE__)
 
-describe 'Template Ezamar' do |describe|
-  ::Ramaze::Spec::Examples::Templates.tests( describe, 'Ezamar' )
+describe 'Template Ezamar' do
+  behaves_like :template_spec
+  spec_template 'Ezamar'
 end

data/spec/examples/templates/template_haml.rb

@@ -1,9 +1,13 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'haml'
-require 'examples/templates/template_haml'
+require File.expand_path('../../../../examples/templates/template_haml', __FILE__)
 
-describe 'Template Haml' do |describe|
-  ::Ramaze::Spec::Examples::Templates.tests( describe, 'Haml' )
+describe 'Template Haml' do
+  behaves_like :template_spec
+  spec_template 'Haml'
 end

data/spec/examples/templates/template_liquid.rb

@@ -1,9 +1,13 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'liquid'
-require 'examples/templates/template_liquid'
+require File.expand_path('../../../../examples/templates/template_liquid', __FILE__)
 
-describe 'Template Liquid' do |describe|
-  ::Ramaze::Spec::Examples::Templates.tests( describe, 'Liquid' )
+describe 'Template Liquid' do
+  behaves_like :template_spec
+  spec_template 'Liquid'
 end

data/spec/examples/templates/template_markaby.rb

@@ -1,10 +1,14 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
-#spec_require 'markaby'
-#require 'examples/templates/template_markaby'
+# spec_require 'markaby'
+# require File.expand_path('../../../../examples/templates/template_erubis', __FILE__)
 
-describe 'Template Markaby' do |describe|
-  #::Ramaze::Spec::Examples::Templates.tests( describe, 'Markaby' )
+describe 'Template Markaby' do
+  # behaves_like :template_spec
+  # spec_template 'Markaby'
   it("isn't yet implemented"){ should.flunk('needed Ramaze::View::Markaby') }
 end

data/spec/examples/templates/template_nagoro.rb

@@ -1,9 +1,13 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
-require 'examples/templates/template_nagoro'
+spec_require 'nagoro'
+require File.expand_path('../../../../examples/templates/template_nagoro', __FILE__)
 
-describe 'Template Nagoro' do |describe|
-  ::Ramaze::Spec::Examples::Templates.tests( describe, 'Nagoro' )
+describe 'Template Nagoro' do
+  behaves_like :template_spec
+  spec_template 'Nagoro'
 end
-

data/spec/examples/templates/template_redcloth.rb

@@ -1,9 +1,13 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'redcloth'
-spec_require 'examples/templates/template_redcloth'
+require File.expand_path('../../../../examples/templates/template_redcloth', __FILE__)
 
-describe 'Template RedCloth' do |describe|
-  ::Ramaze::Spec::Examples::Templates.tests( describe, 'RedCloth' )
+describe 'Template RedCloth' do
+  behaves_like :template_spec
+  spec_template 'RedCloth'
 end

data/spec/examples/templates/template_remarkably.rb

@@ -1,9 +1,13 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'remarkably/engines/html'
-require 'examples/templates/template_remarkably'
+require File.expand_path('../../../../examples/templates/template_remarkably', __FILE__)
 
-describe 'Template Remarkably' do |describe|
-  ::Ramaze::Spec::Examples::Templates.tests( describe, 'Remarkably' )
+describe 'Template Remarkably' do
+  behaves_like :template_spec
+  spec_template 'Remarkably'
 end

data/spec/examples/templates/template_tenjin.rb

@@ -1,9 +1,13 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'tenjin'
-require 'examples/templates/template_tenjin'
+require File.expand_path('../../../../examples/templates/template_tenjin', __FILE__)
 
-describe 'Template Tenjin' do |describe|
-  ::Ramaze::Spec::Examples::Templates.tests( describe, 'Tenjin' )
+describe 'Template Tenjin' do
+  behaves_like :template_spec
+  spec_template 'Tenjin'
 end

data/spec/helper.rb

@@ -4,7 +4,6 @@ if caller_line = caller.grep(%r!spec/ramaze/!).first
   $0 = caller_file
 end
 
-require File.expand_path(File.join(File.dirname(__FILE__), "../lib/ramaze"))
-require 'ramaze/spec'
+require File.expand_path('../../lib/ramaze/spec/bacon', __FILE__)
 
 Ramaze.options.roots = [caller_root] if caller_root

data/spec/ramaze/action/render.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class SpecAction < Ramaze::Controller
   map '/'

data/spec/ramaze/app.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../spec/helper', __FILE__)
 
 class SpecAppMain < Ramaze::Controller
   map '/', :core
@@ -36,7 +39,7 @@ Ramaze::App[:core].location = '/'
 Ramaze::App[:other].location = '/other'
 
 describe Ramaze::App do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'handles call with rack env' do
     get('/').body.should == 'core main'