diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/coderay_suite.rb | 2 | ||||
-rw-r--r-- | test/ruby/diffed.in.rb | 30 | ||||
-rw-r--r-- | test/ruby/diffed.out.raydebug | 30 |
3 files changed, 61 insertions, 1 deletions
diff --git a/test/coderay_suite.rb b/test/coderay_suite.rb index 7829a54..d44d8e9 100644 --- a/test/coderay_suite.rb +++ b/test/coderay_suite.rb @@ -84,7 +84,7 @@ module CodeRay File.open(computed, 'wb') { |f| f.write result } print `gvimdiff #{output} #{computed}` if ENV['diff'] end - assert(ok, "Scan error: #{computed} != #{output}") unless ENV['diff'] + assert(ok, "Scan error: #{computed} != #{output}") unless ENV['diff'] or ENV['noassert'] else File.open(output, 'wb') do |f| f.write result end puts "New test: #{output}" diff --git a/test/ruby/diffed.in.rb b/test/ruby/diffed.in.rb new file mode 100644 index 0000000..a1deb0f --- /dev/null +++ b/test/ruby/diffed.in.rb @@ -0,0 +1,30 @@ +## example diff [diff]
+Index: /Users/jgoebel/rails/pastie/app/controllers/pastes_controller.rb
+===================================================================
+--- /Users/jgoebel/rails/pastie/app/controllers/pastes_controller.rb (revision 1431)
++++ /Users/jgoebel/rails/pastie/app/controllers/pastes_controller.rb (revision 1437)
+@@ -1,6 +1,10 @@
++require 'login_system'
+ require 'coderay'
+
+ class PastesController < ApplicationController
++ include LoginSystem
++
++ before_filter :attempt_cookie_login
+
+ # caches_action :recent
+
+@@ -10,11 +14,7 @@
+
+ def show
+ @paste = Paste.find(params[:id])
+- if params[:key] and params[:key]==User.new(@paste.nick).magic_mojo
+- session[:login]=@paste.nick
+- return redirect_to(:action => 'show', :id => @paste.id)
+- end
+-
++ attempt_key_login if not logged_in?
+ unless @paste.asset or not @paste.body.blank?
+ render :action => "edit"
+ end
+
diff --git a/test/ruby/diffed.out.raydebug b/test/ruby/diffed.out.raydebug new file mode 100644 index 0000000..8881649 --- /dev/null +++ b/test/ruby/diffed.out.raydebug @@ -0,0 +1,30 @@ +comment(## example diff [diff]) +constant(Index)operator(:) regexp<delimiter(/)content(Users)delimiter(/)>ident(jgoebel)operator(/)ident(rails)operator(/)ident(pastie)operator(/)ident(app)operator(/)ident(controllers)operator(/)ident(pastes_controller)operator(.)ident(rb) +operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(===)operator(=) +operator(-)operator(-)operator(-) regexp<delimiter(/)content(Users)delimiter(/)>ident(jgoebel)operator(/)ident(rails)operator(/)ident(pastie)operator(/)ident(app)operator(/)ident(controllers)operator(/)ident(pastes_controller)operator(.)ident(rb) operator(()ident(revision) integer(1431)operator(\)) +operator(+)operator(+)operator(+) regexp<delimiter(/)content(Users)delimiter(/)>ident(jgoebel)operator(/)ident(rails)operator(/)ident(pastie)operator(/)ident(app)operator(/)ident(controllers)operator(/)ident(pastes_controller)operator(.)ident(rb) operator(()ident(revision) integer(1437)operator(\)) +error(@)error(@) integer(-1)operator(,)integer(6) integer(+1)operator(,)integer(10) error(@)error(@) +operator(+)ident(require) string<delimiter(')content(login_system)delimiter(')> + ident(require) string<delimiter(')content(coderay)delimiter(')> + + reserved(class) class(PastesController) operator(<) constant(ApplicationController) +operator(+) ident(include) constant(LoginSystem) +operator(+) +operator(+) ident(before_filter) symbol(:attempt_cookie_login) + + comment(# caches_action :recent) + +error(@)error(@) integer(-10)operator(,)integer(11) integer(+14)operator(,)integer(7) error(@)error(@) + + reserved(def) method(show) + instance_variable(@paste) operator(=) constant(Paste)operator(.)ident(find)operator(()ident(params)operator([)symbol(:id)operator(])operator(\)) +operator(-) 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) +operator(-) ident(session)operator([)symbol(:login)operator(])operator(=)instance_variable(@paste)operator(.)ident(nick) +operator(-) reserved(return) ident(redirect_to)operator(()symbol(:action) operator(=)operator(>) string<delimiter(')content(show)delimiter(')>operator(,) symbol(:id) operator(=)operator(>) instance_variable(@paste)operator(.)ident(id)operator(\)) +operator(-) reserved(end) +operator(-) +operator(+) 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<delimiter(")content(edit)delimiter(")> + reserved(end) + |