rails_format_spec.rb in wvanbergen-request-log-analyzer-1.0.0

- old
+ new

@@ -2,11 +2,11 @@
 
 describe RequestLogAnalyzer::LogParser, "Rails without combined requests" do
   include RequestLogAnalyzerSpecHelper
   
   before(:each) do
-    @log_parser = RequestLogAnalyzer::LogParser.new(:rails, :combined_requests => false)
+    @log_parser = RequestLogAnalyzer::LogParser.new(RequestLogAnalyzer::FileFormat.load(:rails), :combined_requests => false)
   end
   
   it "should parse a stream and find valid requests" do
     io = File.new(log_fixture(:rails_1x), 'r')
     @log_parser.parse_io(io) do |request| 
@@ -18,20 +18,20 @@
   it "should find 8 requests when lines are not linked" do
     requests = []
     @log_parser.parse_file(log_fixture(:rails_1x)) { |request| requests << request }
     requests.length.should == 8
     requests.each { |r| r.should be_single_line }
-    requests.select { |r| r.line_type == :started }.should have(4).items
+    requests.select { |r| r.line_type == :processing }.should have(4).items
   end  
 end
 
 
 describe RequestLogAnalyzer::LogParser, "Rails with combined requests" do
   include RequestLogAnalyzerSpecHelper
   
   before(:each) do
-    @log_parser = RequestLogAnalyzer::LogParser.new(:rails, :combined_requests => true)
+    @log_parser = RequestLogAnalyzer::LogParser.new(RequestLogAnalyzer::FileFormat.load(:rails), :combined_requests => true)
   end
   
   it "should have a valid language definitions" do
     @log_parser.file_format.should be_valid
   end
@@ -43,10 +43,10 @@
   end  
   
   it "should parse a Rails 2.2 request properly" do
     @log_parser.should_not_receive(:warn)
     @log_parser.parse_file(log_fixture(:rails_22)) do |request|
-      request.should =~ :started
+      request.should =~ :processing
       request.should =~ :completed  
     
       request[:controller].should == 'PageController'
       request[:action].should     == 'demo'
       request[:url].should        == 'http://www.example.coml/demo'    
\ No newline at end of file