http2_spec.rb in http2-0.0.24

- old
+ new

@@ -4,34 +4,34 @@
   it "should be able to recursively parse post-data-hashes." do
     res = Http2.post_convert_data(
       "test1" => "test2"
     )
     raise "Expected 'test1=test2' but got: '#{res}'." if res != "test1=test2"
-    
+
     res = Http2.post_convert_data(
       "test1" => [1, 2, 3]
     )
     raise "Expected 'test1%5B0%5D=1&test1%5B1%5D=2&test1%5B2%5D=3' but got: '#{res}'." if res != "test1%5B0%5D=1&test1%5B1%5D=2&test1%5B2%5D=3"
-    
+
     res = Http2.post_convert_data(
       "test1" => {
         "order" => {
           [:Bnet_profile, "profile_id"] => 5
         }
       }
     )
     raise "Expected 'test1%5Border%5D%5B%5B%3ABnet_profile%2C+%22profile_id%22%5D%5D=5' but got: '#{res}'." if res != "test1%5Border%5D%5B%5B%3ABnet_profile%2C+%22profile_id%22%5D%5D=5"
   end
-  
+
   it "should be able to do normal post-requests." do
     require "json"
-    
+
     #Test posting keep-alive and advanced post-data.
     Http2.new(:host => "www.partyworm.dk", :debug => false) do |http|
       0.upto(5) do
         resp = http.get("multipart_test.php")
-        
+
         resp = http.post(:url => "multipart_test.php?choice=post-test", :post => {
           "val1" => "test1",
           "val2" => "test2",
           "val3" => [
             "test3"
@@ -47,28 +47,28 @@
             ]
           },
           "val9" => ["a", "b", "d"]
         })
         res = JSON.parse(resp.body)
-        
+
         raise "Expected 'res' to be a hash." if !res.is_a?(Hash)
         raise "Error 1" if res["val1"] != "test1"
         raise "Error 2" if res["val2"] != "test2"
         raise "Error 3" if !res["val3"] or res["val3"][0] != "test3"
         raise "Error 4" if res["val4"]["val5"] != "test5"
         raise "Error 5" if res["val6"]["val7"][0]["val8"] != "test8"
         raise "Array error: '#{res["val9"]}'." if res["val9"][0] != "a" or res["val9"][1] != "b" or res["val9"][2] != "d"
       end
     end
   end
-  
+
   it "should be able to do multipart-requests and keep-alive when using multipart." do
     Http2.new(:host => "www.partyworm.dk", :follow_redirects => false, :encoding_gzip => false, :debug => false) do |http|
       0.upto(5) do
         fpath = File.realpath(__FILE__)
         fpath2 = "#{File.realpath(File.dirname(__FILE__))}/../lib/http2.rb"
-        
+
         resp = http.post_multipart(:url => "multipart_test.php", :post => {
           "test_var" => "true",
           "test_file1" => {
             :fpath => fpath,
             :filename => "specfile"
@@ -76,74 +76,74 @@
           "test_file2" => {
             :fpath => fpath2,
             :filename => "http2.rb"
           }
         })
-        
+
         data = JSON.parse(resp.body)
-        
+
         raise "Expected 'test_var' post to be 'true' but it wasnt: '#{data["post"]["test_var"]}'." if data["post"]["test_var"] != "true"
         raise "Expected 'test_file1' to be the same as file but it wasnt:\n#{data["files_data"]["test_file1"]}\n\n#{File.read(fpath)}" if data["files_data"]["test_file1"] != File.read(fpath)
         raise "Expected 'test_file2' to be the same as file but it wasnt:\n#{data["files_data"]["test_file2"]}\n\n#{File.read(fpath)}" if data["files_data"]["test_file2"] != File.read(fpath2)
       end
     end
   end
-  
+
   it "it should be able to handle keep-alive correctly" do
     urls = [
       "?show=users_search",
       "?show=users_online",
       "?show=drinksdb",
       "?show=forum&fid=9&tid=1917&page=0"
     ]
     urls = ["robots.txt"]
-    
+
     Http2.new(:host => "www.partyworm.dk", :debug => false) do |http|
       0.upto(105) do |count|
         url = urls[rand(urls.size)]
         #print "Doing request #{count} of 200 (#{url}).\n"
         res = http.get(url)
         raise "Body was empty." if res.body.to_s.length <= 0
       end
     end
   end
-  
+
   it "should be able to convert URL's to 'is.gd'-short-urls" do
     isgd = Http2.isgdlink("https://github.com/kaspernj/http2")
     raise "Expected isgd-var to be valid but it wasnt: '#{isgd}'." if !isgd.match(/^http:\/\/is\.gd\/([A-z\d]+)$/)
   end
-  
+
   it "should raise exception when something is not found" do
     expect{
       Http2.new(:host => "www.partyworm.dk") do |http|
         http.get("something_that_does_not_exist.php")
       end
-    }.to raise_error
+    }.to raise_error(::Http2::Errors::Notfound)
   end
-  
+
   it "should be able to post json" do
     Http2.new(:host => "http2test.kaspernj.org") do |http|
       res = http.post(
         :url => "/jsontest.php",
         :json => {:testkey => "testvalue"}
       )
-      
+
       data = JSON.parse(res.body)
       data["_SERVER"]["CONTENT_TYPE"].should eql("application/json")
       data["PHP_JSON_INPUT"]["testkey"].should eql("testvalue")
     end
   end
-  
+
   it "should be able to post custom content types" do
     require "json"
-    
+
     Http2.new(:host => "http2test.kaspernj.org") do |http|
       res = http.post(
         :url => "/content_type_test.php",
         :content_type => "plain/text",
         :post => "test1_test2_test3"
       )
-      
+
       data = JSON.parse(res.body)
       data["_SERVER"]["CONTENT_TYPE"].should eql("plain/text")
       data["PHP_INPUT"].should eql("test1_test2_test3")
     end
   end
\ No newline at end of file