NEW - bug 384764: Upgrade Rails 3.1.4
https://bugs.eclipse.org/bugs/show_bug.cgi?id=384764
diff --git a/source/test/integration/authoring_test.rb b/source/test/integration/authoring_test.rb
index ccbd272..430d5d7 100644
--- a/source/test/integration/authoring_test.rb
+++ b/source/test/integration/authoring_test.rb
@@ -48,7 +48,7 @@
assert_match 'REPLACED', @response.body
assert_page_success @page1
- put 'pages/checkin', :version => {:id => v.id, :note => 'Change of George updated'} # TODO post or put, currently it is a big mess
+ put 'pages/checkin', :version => {:id => v.id, :note => 'Change of George updated'} # TODO post or put, improve
assert_redirected_to '/' + v.wiki.rel_path + '/' + v.page.rel_path
v.reload
assert_equal 'Change of George updated', v.note
@@ -97,8 +97,10 @@
assert File.exists? path
get diff_url
diff_html = File.read(path)
- assert diff_html.include? "<del>This role leads and coordinates requirements elicitation; outlines and delimits the system's functionality; specifies and maintains the detailed system requirements.</del><ins>This role REPLACED; outlines and delimits the system's functionality; specifies and maintains the detailed system requirements.</ins></td>"
-
+ assert diff_html.include? "<del>"
+ assert diff_html.include? "<ins>"
+ assert diff_html.include? "This role leads and coordinates"
+ assert diff_html.include? "This role REPLACED; outlines and delim"
v = @page1.current_version
v.html = File.read(File.join(Rails.root, 'test', 'integration', 'authoring_test.html')) # this is a file authored by TinyMCE
File.delete(path)
diff --git a/source/test/unit/checkout_test.rb b/source/test/unit/checkout_test.rb
index e0f556c..636dcd0 100644
--- a/source/test/unit/checkout_test.rb
+++ b/source/test/unit/checkout_test.rb
@@ -167,7 +167,7 @@
assert_equal nil, html_version.index('<!-- epfwiki head start -->') # wiki stuff removed
assert_equal nil, html_version.index('<!-- epfwiki iframe start -->')
# replaced stuff in version file
- File.open('magweg.html', 'w') {|f| f.write(html_page) }
+ #File.open('magweg.html', 'w') {|f| f.write(html_page) }
assert_not_nil html_version.index(Page::TREEBROWSER_PLACEHOLDER) # TODO test this
# assert_not_nil html_version.index('<!-- copyright statement -->')
# stuff to be removed from page
