From 9dc56f4b4e31d0229cd615ee8ae9bbeec7a313d7 Mon Sep 17 00:00:00 2001 From: murphy Date: Tue, 30 Mar 2010 22:30:08 +0000 Subject: Updated diff scanner tests. --- test/scanners/diff/example.expected.raydebug | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'test/scanners/diff/example.expected.raydebug') diff --git a/test/scanners/diff/example.expected.raydebug b/test/scanners/diff/example.expected.raydebug index 3e836fa..01eae8c 100644 --- a/test/scanners/diff/example.expected.raydebug +++ b/test/scanners/diff/example.expected.raydebug @@ -1,27 +1,27 @@ -head[head(===================================================================)] -head[head(--- )plain(/Users/jgoebel/rails/pastie/app/controllers/pastes_controller.rb (revision 1431\))] -head[head(+++ )plain(/Users/jgoebel/rails/pastie/app/controllers/pastes_controller.rb (revision 1437\))] +head[head(===================================================================)filename()] +head[head(--- )filename(/Users/jgoebel/rails/pastie/app/controllers/pastes_controller.rb)plain( (revision 1431\))] +head[head(+++ )filename(/Users/jgoebel/rails/pastie/app/controllers/pastes_controller.rb)plain( (revision 1437\))] change[change(@@)plain( -1,6 +1,10 )change(@@)] -insert[insert(+)plain(require 'login_system')] -comment( require 'coderay') -comment( ) -comment( class PastesController < ApplicationController) -insert[insert(+)plain( include LoginSystem)] +insert[insert(+)ident(require) string] + ident(require) string + + reserved(class) class(PastesController) operator(<) constant(ApplicationController) +insert[insert(+) ident(include) constant(LoginSystem)] insert[insert(+)] -insert[insert(+)plain( before_filter :attempt_cookie_login)] -comment( ) -comment( # caches_action :recent) -comment( ) +insert[insert(+) ident(before_filter) symbol(:attempt_cookie_login)] + + comment(# caches_action :recent) + change[change(@@)plain( -10,11 +14,7 )change(@@)] -comment( ) -comment( def show) -comment( @paste = Paste.find(params[:id]\)) -delete[delete(-)plain( if params[:key] and params[:key]==User.new(@paste.nick\).magic_mojo)] -delete[delete(-)plain( session[:login]=@paste.nick)] -delete[delete(-)plain( return redirect_to(:action => 'show', :id => @paste.id\))] -delete[delete(-)plain( end)] -delete[delete(-)plain( )] -insert[insert(+)plain( attempt_key_login if not logged_in?)] -comment( unless @paste.asset or not @paste.body.blank?) -comment( render :action => "edit") -comment( end) \ No newline at end of file + + reserved(def) method(show) + instance_variable(@paste) operator(=) constant(Paste)operator(.)ident(find)operator(()ident(params)operator([)symbol(:id)operator(])operator(\)) +delete[delete(-) reserved(if) ident(params)operator([)symbol(:key)operator(]) reserved(and) ident(params)operator([)symbol(:key)operator(])operator(==)constant(User)operator(.)ident(new)operator(()instance_variable(@paste)operator(.)ident(nick)operator(\))operator(.)ident(magic_mojo)] +delete[delete(-) ident(session)operator([)symbol(:login)operator(])operator(=)instance_variable(@paste)operator(.)ident(nick)] +delete[delete(-) reserved(return) ident(redirect_to)operator(()symbol(:action) operator(=)operator(>) stringoperator(,) symbol(:id) operator(=)operator(>) instance_variable(@paste)operator(.)ident(id)operator(\))] +delete[delete(-) reserved(end)] +delete[delete(-) ] +insert[insert(+) ident(attempt_key_login) reserved(if) reserved(not) ident(logged_in?)] + reserved(unless) instance_variable(@paste)operator(.)ident(asset) reserved(or) reserved(not) instance_variable(@paste)operator(.)ident(body)operator(.)ident(blank?) + ident(render) symbol(:action) operator(=)operator(>) string + reserved(end) \ No newline at end of file -- cgit v1.2.1