spec/rails_format_spec.rb in wvanbergen-request-log-analyzer-1.1.1 vs spec/rails_format_spec.rb in wvanbergen-request-log-analyzer-1.1.2

@@ -78,43 +78,44 @@
 describe "RequestLogAnalyzer::FileFormat::RailsDevelopment - Rails with development details" do
   include RequestLogAnalyzerSpecHelper
   
   before(:each) do
     @file_format = RequestLogAnalyzer::FileFormat.load(:rails_development)
+    @request = @file_format.create_request
   end
   
   it "should have a valid language definitions" do
     @file_format.should be_valid
   end
   
   it "should parse a rendered line" do
-    info = @file_format.line_definitions[:rendered].matches("Rendered layouts/_footer (2.9ms)")
+    info = @file_format.line_definitions[:rendered].match_for("Rendered layouts/_footer (2.9ms)", @request)
     info[:render_file].should == 'layouts/_footer'
     info[:render_duration].should == 0.0029
   end
   
   it "should parse a query executed line with colors" do
-    info = @file_format.line_definitions[:query_executed].matches(" User Load (0.4ms)   SELECT * FROM `users` WHERE (`users`.`id` = 18205844) ")
+    info = @file_format.line_definitions[:query_executed].match_for(" User Load (0.4ms)   SELECT * FROM `users` WHERE (`users`.`id` = 18205844) ", @request)
     info[:query_class].should == 'User'
     info[:query_duration].should == 0.0004
     info[:query_sql].should == 'SELECT * FROM `users` WHERE (`users`.`id` = 18205844)'
   end  
   
   it "should parse a query executed line without colors" do
-    info = @file_format.line_definitions[:query_executed].matches(" User Load (0.4ms)   SELECT * FROM `users` WHERE (`users`.`id` = 18205844) ")
+    info = @file_format.line_definitions[:query_executed].match_for(" User Load (0.4ms)   SELECT * FROM `users` WHERE (`users`.`id` = 18205844) ", @request)
     info[:query_class].should == 'User'
     info[:query_duration].should == 0.0004
     info[:query_sql].should == 'SELECT * FROM `users` WHERE (`users`.`id` = 18205844)'    
   end  
   
   it "should parse a cached query line with colors" do
-    info = @file_format.line_definitions[:query_cached].matches(' CACHE (0.0ms)   SELECT * FROM `users` WHERE (`users`.`id` = 0) ')
+    info = @file_format.line_definitions[:query_cached].match_for(' CACHE (0.0ms)   SELECT * FROM `users` WHERE (`users`.`id` = 0) ', @request)
     info[:cached_duration].should == 0.0
     info[:cached_sql].should == 'SELECT * FROM `users` WHERE (`users`.`id` = 0)'   
   end
   
   it "should parse a cached query line without colors" do
-    info = @file_format.line_definitions[:query_cached].matches(' CACHE (0.0ms)   SELECT * FROM `users` WHERE (`users`.`id` = 0) ')
+    info = @file_format.line_definitions[:query_cached].match_for(' CACHE (0.0ms)   SELECT * FROM `users` WHERE (`users`.`id` = 0) ', @request)
     info[:cached_duration].should == 0.0
     info[:cached_sql].should == 'SELECT * FROM `users` WHERE (`users`.`id` = 0)'   
   end  
 end
\ No newline at end of file