jro_apps/redmine Commit - r4545:e4f72a8e3afb

scm: add compatible functional test fof changing diff revisions label at SCM adapter level....

Toshi MARUYAMA -

r4545:e4f72a8e3afb

parent child

Context file:

r4545:e4f72a8e3afb

Collapse all files

test/functional/repositories_git_controller_test.rb +23 -4

             # redMine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             require 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesGitControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
-                Repository::Git.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+                @repository = Repository::Git.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+                assert @repository
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_browse_root
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 9, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'this_is_a_really_long_and_verbose_directory_name' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'copied_README' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'new_file.txt' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'renamed_test.txt' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'filemane with spaces.txt' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == ' filename with a leading space.txt ' && e.kind == 'file'}
                 end
                 def test_browse_branch
                   get :show, :id => 3, :rev => 'test_branch'
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 4, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'test.txt' && e.kind == 'file'}
                 end
                 def test_browse_directory
                   get :show, :id => 3, :path => ['images']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['edit.png'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
                   assert_not_nil entry
                   assert_equal 'file', entry.kind
                   assert_equal 'images/edit.png', entry.path
                 end
                 def test_browse_at_given_revision
                   get :show, :id => 3, :path => ['images'], :rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                 end
                 def test_changes
                   get :changes, :id => 3, :path => ['images', 'edit.png']
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'edit.png'
                 end
                 def test_entry_show
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'entry'
                   # Line 19
                   assert_tag :tag => 'th',
                              :content => /11/,
                              :attributes => { :class => /line-num/ },
                              :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
                 end
                 def test_entry_download
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
                 def test_directory_entry
                   get :entry, :id => 3, :path => ['sources']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
+                  @repository.fetch_changesets
+                  @repository.reload
                   # Full diff of changeset 2f9c0091
                   get :diff, :id => 3, :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
                   assert_response :success
                   assert_template 'diff'
                   # Line 22 removed
                   assert_tag :tag => 'th',
                              :content => /22/,
                              :sibling => { :tag => 'td',
                                            :attributes => { :class => /diff_out/ },
                                            :content => /def remove/ }
+                  assert_tag :tag => 'h2', :content => /2f9c0091/
+                end
+                def test_diff_two_revs
+                  @repository.fetch_changesets
+                  @repository.reload
+                  get :diff, :id => 3, :rev    => '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
+                                       :rev_to => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
+                  assert_response :success
+                  assert_template 'diff'
+                  diff = assigns(:diff)
+                  assert_not_nil diff
+                  assert_tag :tag => 'h2', :content => /2f9c0091:61b685fb/
                 end
                 def test_annotate
                   get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'annotate'
                   # Line 23, changeset 2f9c0091
                   assert_tag :tag => 'th', :content => /24/,
                              :sibling => { :tag => 'td', :child => { :tag => 'a', :content => /2f9c0091/ } },
                              :sibling => { :tag => 'td', :content => /jsmith/ },
                              :sibling => { :tag => 'td', :content => /watcher =/ }
                 end
                 def test_annotate_binary_file
                   get :annotate, :id => 3, :path => ['images', 'edit.png']
                   assert_response 500
                   assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                                             :content => /can not be annotated/
                 end
               else
                 puts "Git test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/functional/repositories_subversion_controller_test.rb +4 0

             # redMine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             require 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesSubversionControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
                        :repositories, :issues, :issue_statuses, :changesets, :changes,
                        :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 Setting.default_language = 'en'
                 User.current = nil
               end
               if repository_configured?('subversion')
                 def test_show
                   get :show, :id => 1
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_browse_root
                   get :show, :id => 1
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   entry = assigns(:entries).detect {|e| e.name == 'subversion_test'}
                   assert_equal 'dir', entry.kind
                 end
                 def test_browse_directory
                   get :show, :id => 1, :path => ['subversion_test']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['[folder_with_brackets]', 'folder', '.project', 'helloworld.c', 'textfile.txt'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'helloworld.c'}
                   assert_equal 'file', entry.kind
                   assert_equal 'subversion_test/helloworld.c', entry.path
                   assert_tag :a, :content => 'helloworld.c', :attributes => { :class => /text\-x\-c/ }
                 end
                 def test_browse_at_given_revision
                   get :show, :id => 1, :path => ['subversion_test'], :rev => 4
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['folder', '.project', 'helloworld.c', 'helloworld.rb', 'textfile.txt'], assigns(:entries).collect(&:name)
                 end
                 def test_file_changes
                   get :changes, :id => 1, :path => ['subversion_test', 'folder', 'helloworld.rb' ]
                   assert_response :success
                   assert_template 'changes'
                   changesets = assigns(:changesets)
                   assert_not_nil changesets
                   assert_equal %w(6 3 2), changesets.collect(&:revision)
                   # svn properties displayed with svn >= 1.5 only
                   if Redmine::Scm::Adapters::SubversionAdapter.client_version_above?([1, 5, 0])
                     assert_not_nil assigns(:properties)
                     assert_equal 'native', assigns(:properties)['svn:eol-style']
                     assert_tag :ul,
                                :child => { :tag => 'li',
                                            :child => { :tag => 'b', :content => 'svn:eol-style' },
                                            :child => { :tag => 'span', :content => 'native' } }
                   end
                 end
                 def test_directory_changes
                   get :changes, :id => 1, :path => ['subversion_test', 'folder' ]
                   assert_response :success
                   assert_template 'changes'
                   changesets = assigns(:changesets)
                   assert_not_nil changesets
                   assert_equal %w(10 9 7 6 5 2), changesets.collect(&:revision)
                 end
                 def test_entry
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c']
                   assert_response :success
                   assert_template 'entry'
                 end
                 def test_entry_should_send_if_too_big
                   # no files in the test repo is larger than 1KB...
                   with_settings :file_max_size_displayed => 0 do
                     get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c']
                     assert_response :success
                     assert_template ''
                     assert_equal 'attachment; filename="helloworld.c"', @response.headers['Content-Disposition']
                   end
                 end
                 def test_entry_at_given_revision
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.rb'], :rev => 2
                   assert_response :success
                   assert_template 'entry'
                   # this line was removed in r3 and file was moved in r6
                   assert_tag :tag => 'td', :attributes => { :class => /line-code/},
                                            :content => /Here's the code/
                 end
                 def test_entry_not_found
                   get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']
                   assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                                             :content => /The entry or revision was not found in the repository/
                 end
                 def test_entry_download
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c'], :format => 'raw'
                   assert_response :success
                   assert_template ''
                   assert_equal 'attachment; filename="helloworld.c"', @response.headers['Content-Disposition']
                 end
                 def test_directory_entry
                   get :entry, :id => 1, :path => ['subversion_test', 'folder']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'folder', assigns(:entry).name
                 end
                 def test_revision
                   get :revision, :id => 1, :rev => 2
                   assert_response :success
                   assert_template 'revision'
                   assert_tag :tag => 'ul',
                              :child => { :tag => 'li',
                                          # link to the entry at rev 2
                                          :child => { :tag => 'a',
                                                      :attributes => {:href => '/projects/ecookbook/repository/revisions/2/entry/test/some/path/in/the/repo'},
                                                      :content => 'repo',
                                                      # link to partial diff
                                                      :sibling =>  { :tag => 'a',
                                                                     :attributes => { :href => '/projects/ecookbook/repository/revisions/2/diff/test/some/path/in/the/repo' }
                                                                    }
                                                     }
                                         }
                 end
                 def test_invalid_revision
                   get :revision, :id => 1, :rev => 'something_weird'
                   assert_response 500
                   assert_error_tag :content => /was not found/
                 end
                 def test_revision_with_repository_pointing_to_a_subdirectory
                   r = Project.find(1).repository
                   # Changes repository url to a subdirectory
                   r.update_attribute :url, (r.url + '/test/some')
                   get :revision, :id => 1, :rev => 2
                   assert_response :success
                   assert_template 'revision'
                   assert_tag :tag => 'ul',
                              :child => { :tag => 'li',
                                          # link to the entry at rev 2
                                          :child => { :tag => 'a',
                                                      :attributes => {:href => '/projects/ecookbook/repository/revisions/2/entry/path/in/the/repo'},
                                                      :content => 'repo',
                                                      # link to partial diff
                                                      :sibling =>  { :tag => 'a',
                                                                     :attributes => { :href => '/projects/ecookbook/repository/revisions/2/diff/path/in/the/repo' }
                                                                    }
                                                     }
                                         }
                 end
                 def test_revision_diff
                   get :diff, :id => 1, :rev => 3
                   assert_response :success
                   assert_template 'diff'
+                  assert_tag :tag => 'h2', :content => /3/
                 end
                 def test_directory_diff
                   get :diff, :id => 1, :rev => 6, :rev_to => 2, :path => ['subversion_test', 'folder']
                   assert_response :success
                   assert_template 'diff'
                   diff = assigns(:diff)
                   assert_not_nil diff
                   # 2 files modified
                   assert_equal 2, Redmine::UnifiedDiff.new(diff).size
+                  assert_tag :tag => 'h2', :content => /2:6/
                 end
                 def test_annotate
                   get :annotate, :id => 1, :path => ['subversion_test', 'helloworld.c']
                   assert_response :success
                   assert_template 'annotate'
                 end
               else
                 puts "Subversion test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages