ramaze 2012.12.08 → 2023.01.06

data/spec/ramaze/error.rb

@@ -2,8 +2,7 @@
 # All files in this distribution are subject to the terms of the MIT license.
 
 require File.expand_path('../../../spec/helper', __FILE__)
-require 'rexml/document'
-require 'rexml/xpath'
+require 'nokogiri'
 
 class SpecError < Ramaze::Controller
   map '/'
@@ -40,15 +39,14 @@ describe 'Error handling' do
   Ramaze.options.mode = :dev
 
   it 'uses Rack::ShowException to display errors' do
-    got = get('/raises')
-    [got.status, got['Content-Type']].should == [500, 'text/html']
-
-    # we use this xpath notation because otherwise rexml is really slow...
-    doc = REXML::Document.new(got.body)
-    REXML::XPath.first(doc, "/html/body/div[1]/h1").text.
-      should == "NameError at /raises"
-    REXML::XPath.first(doc, "/html/body/div[4]/p/code").text.
-      should == "Rack::ShowExceptions"
+    got = get('/raises', {}, {'HTTP_ACCEPT' => 'text/html'})
+    got.status.should == 500
+    got['Content-Type'].should == 'text/html'
+
+    doc = Nokogiri::HTML(got.body)
+    doc.at("#summary").text.should.match(/NameError at \/raises/)
+    doc.at("#explanation").text.strip.should ==
+      "You're seeing this error because you use Rack::ShowExceptions."
   end
 
   it 'uses original action_missing when no action was found' do
@@ -78,11 +76,9 @@ describe 'Error handling' do
     got = get('/empty')
     [got.status, got['Content-Type']].should == [404, 'text/html']
 
-    # we use this xpath notation because otherwise rexml is really slow...
-    doc = REXML::Document.new(got.body)
-    REXML::XPath.first(doc, "/html/body/div[1]/h1").text.strip.
-      should == "Not Found"
-    REXML::XPath.first(doc, "/html/body/div[3]/p/code").text.
-      should == "Rack::ShowStatus"
+    doc = Nokogiri::HTML(got.body)
+    doc.at("#info").text.strip.should == "Not Found"
+    doc.at("#explanation").text.strip.should ==
+      "You're seeing this error because you use Rack::ShowStatus."
   end
 end

data/spec/ramaze/helper/paginate.rb

@@ -32,6 +32,13 @@ class SpecHelperPaginateArray < Ramaze::Controller
     pager.each{|item| out << item }
     out.inspect
   end
+
+  def preserve_params
+    request.params['single'] = 'zero'
+    request.params['multiple'] = %w[ one two three ]
+    pager = paginate(ALPHA)
+    pager.navigation
+  end
 end
 
 describe Ramaze::Helper::Paginate do
@@ -275,5 +282,23 @@ describe Ramaze::Helper::Paginate do
 
     end
 
+    it 'preserves single value params' do
+      doc = Nokogiri::HTML(get("/array/preserve_params").body)
+      params = doc.search("//a").first[:href].split('?').last.split('&')
+      params.should.include 'single=zero'
+      params.should.not.include 'single[]'.escape(:cgi) + '=zero'
+    end
+
+    it 'preserves multi value params' do
+      doc = Nokogiri::HTML(get("/array/preserve_params").body)
+      params = doc.search("//a").first[:href].split('?').last.split('&')
+      params.should.not.include 'multiple=one'
+      params.should.not.include 'multiple=two'
+      params.should.not.include 'multiple=three'
+      params.should.include 'multiple[]'.escape(:cgi) + '=one'
+      params.should.include 'multiple[]'.escape(:cgi) + '=two'
+      params.should.include 'multiple[]'.escape(:cgi) + '=three'
+    end
+
   end
 end

data/spec/ramaze/log/syslog.rb

@@ -56,8 +56,17 @@ describe 'Syslog' do
     }
     logpipe[1].close
     Process.waitpid(child)
-
-    logpipe[0].gets.should == "ramaze_syslog_test[#{child}]: #{msg}\n"
+    label = case priority
+            # when 'debug', 'info', 'error'
+            #   priority
+            when :dev
+              'debug'
+            when :warn
+              'warning'
+            else
+              priority.to_s
+            end
+    logpipe[0].gets.slice(/ramaze.*/).should == "ramaze_syslog_test[#{child}] <#{label.capitalize}>: #{msg}"
   end
 
   it 'should handle debug' do

data/spec/ramaze/session/redis.rb

@@ -2,8 +2,8 @@ require File.expand_path('../../../../spec/helper', __FILE__)
 spec_require 'redis'
 
 spec_precondition 'Redis is running' do
-  cache           = Redis.new
-  cache['active'] = true
+  cache = Redis.new
+  "OK" == cache.set('testkey', 'testval')
 end
 
 class SpecSession < Ramaze::Controller

data/spec/ramaze/view/haml.rb

@@ -72,7 +72,7 @@ describe Ramaze::View::Haml do
   <li>
     <a href='/external'>External template</a>
   </li>
-</ul>"
+</ul>".gsub(/\n\s+/, "\n")
   end
 
   should 'render external template' do
@@ -87,7 +87,7 @@ describe Ramaze::View::Haml do
   <body>
     <h1>Haml Template</h1>
   </body>
-</html>"
+</html>".gsub(/\n\s+/, "\n")
   end
 
   should 'render external template with instance variables' do
@@ -97,7 +97,7 @@ describe Ramaze::View::Haml do
     got.body.strip.should ==
 "<div>
   3
-</div>"
+</div>".gsub(/\n\s+/, "\n")
   end
 
   should 'render the wrapped view twice even with caching' do

data/spec/ramaze/view/slim.rb

@@ -39,7 +39,7 @@ describe 'Ramaze::View::Slim' do
   end
 
   should 'render an external template with variables' do
-    got = get('/external')
+    got = get('/external_vars')
 
     got.status.should          == 200
     got['Content-Type'].should == 'text/html'