Changeset 2201 for lang/ruby/ssb

Timestamp:

12/01/07 03:48:42 (14 months ago)

Author:

lchin

Message:

/lang/ruby/ssb Using more appropriate assertions, tiny Rakefile fix.

Location:

lang/ruby/ssb/trunk

Files:

• Rakefile (modified) (2 diffs)
• test/test_ssb.rb (modified) (4 diffs)

lang/ruby/ssb/trunk/Rakefile

@@ -11 +11 @@
 
 desc "Initial setup"
-task :setup => ["logs", "config/config.yaml", "public_html/.htaccess"]
+task :setup => ["chmod_logs", "config/config.yaml", "public_html/.htaccess"]
 task :setup => [:scrape]
 task :setup => ["ktai:update"]
@@ -64 +64 @@
 directory "public_html/emoji/softbank"
 directory "logs"
-file "logs" do chmod(777, "logs") end
+task "chmod_logs" => ["logs"] do chmod(0777, "logs") end
 file "config/config.yaml" do |t| cp "#{t.name}.default", t.name end
 file "public_html/.htaccess" do |t| cp "#{t.name}.default", t.name end

lang/ruby/ssb/trunk/test/test_ssb.rb

@@ -27 +27 @@
     # CGI Parameters
     ENV['SERVER_NAME'] = 'localhost'
-    ENV['SCRIPT_NAME'] = '/~coji/ssb/index.rbx'
+    ENV['SCRIPT_NAME'] = '/index.rbx'
     ENV['REQUEST_METHOD'] = method
     ENV['QUERY_STRING']   = query_string
@@ -59 +59 @@
   def test_ssb_get_local
     ret = kick_ssb('GET', "q=#{@mock_server.uri}&uid=NULLGWDOCOMO")
-    assert(ret =~ /It works by GET/)
+    assert_match(/It works by GET/, ret)
   end
 
@@ -65 +65 @@
     # noname is invalid hostname
     ret = kick_ssb('GET', 'q=noname')
-    assert(ret =~ /getaddrinfo: nodename nor servname provided/)
+    assert_match(/getaddrinfo: nodename nor servname provided/, ret)
   end
 
   def test_ssb_post_local
     ret = kick_ssb('POST', '', "q=#{@mock_server.uri}&param=test&uid=NULLGWDOCOMO")
-    assert(ret =~ /It works by POST/)
+    assert_match(/It works by POST/, ret)
   end
 
@@ -76 +76 @@
     # noname is invalid hostname
     ret = kick_ssb('POST', '', 'q=noname&param=test&uid=NULLGWDOCOMO')
-    assert(ret =~ /getaddrinfo: nodename nor servname provided/)
+    assert_match(/getaddrinfo: nodename nor servname provided/, ret)
   end
 end