jro_apps/redmine Commit - r14946:dae1e6ab2179

Fix test failures (#22058)....

Jean-Philippe Lang -

r14946:dae1e6ab2179

parent child

Context file:

r14946:dae1e6ab2179

Collapse all files

test/functional/repositories_mercurial_controller_test.rb +1 -4

             # Redmine - project management software
             # Copyright (C) 2006-2016  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__)
             class RepositoriesMercurialControllerTest < ActionController::TestCase
               tests RepositoriesController
               fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
               CHAR_1_HEX = "\xc3\x9c"
               PRJ_ID     = 3
               NUM_REV    = 34
               ruby19_non_utf8_pass = Encoding.default_external.to_s != 'UTF-8'
               def setup
                 User.current = nil
                 @project    = Project.find(PRJ_ID)
                 @repository = Repository::Mercurial.create(
                                   :project => @project,
                                   :url     => REPOSITORY_PATH,
                                   :path_encoding => 'ISO-8859-1'
                                   )
                 assert @repository
                 @diff_c_support = true
                 @char_1        = CHAR_1_HEX.dup.force_encoding('UTF-8')
                 @tag_char_1    = "tag-#{CHAR_1_HEX}-00".force_encoding('UTF-8')
                 @branch_char_0 = "branch-#{CHAR_1_HEX}-00".force_encoding('UTF-8')
                 @branch_char_1 = "branch-#{CHAR_1_HEX}-01".force_encoding('UTF-8')
               end
               if ruby19_non_utf8_pass
                 puts "TODO: Mercurial functional test fails " +
                      "when Encoding.default_external is not UTF-8. " +
                      "Current value is '#{Encoding.default_external.to_s}'"
                 def test_fake; assert true end
               elsif File.directory?(REPOSITORY_PATH)
                 def test_get_new
                   @request.session[:user_id] = 1
                   @project.repository.destroy
                   get :new, :project_id => 'subproject1', :repository_scm => 'Mercurial'
                   assert_response :success
                   assert_template 'new'
                   assert_kind_of Repository::Mercurial, assigns(:repository)
                   assert assigns(:repository).new_record?
                 end
                 def test_show_root
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID
                   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_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_show_directory
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png', '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
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_show_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [0, '0', '0885933ad4f6'].each do |r1|
                     get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_show_directory_sql_escape_percent
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [13, '13', '3a330eb32958'].each do |r1|
                     get :show, :id => PRJ_ID,
                         :path => repository_path_hash(['sql_escape', 'percent%dir'])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ['percent%file1.txt', 'percentfile1.txt'],
                                  assigns(:entries).collect(&:name)
                     changesets = assigns(:changesets)
                     assert_not_nil changesets
                     assert assigns(:changesets).size > 0
                     assert_equal %w(13 11 10 9), changesets.collect(&:revision)
                   end
                 end
                 def test_show_directory_latin_1_path
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [21, '21', 'adf805632193'].each do |r1|
                     get :show, :id => PRJ_ID,
                         :path => repository_path_hash(['latin-1-dir'])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ["make-latin-1-file.rb",
                                   "test-#{@char_1}-1.txt",
                                   "test-#{@char_1}-2.txt",
                                   "test-#{@char_1}.txt"], assigns(:entries).collect(&:name)
                     changesets = assigns(:changesets)
                     assert_not_nil changesets
                     assert_equal %w(21 20 19 18 17), changesets.collect(&:revision)
                   end
                 end
                 def show_should_show_branch_selection_form
                   @repository.fetch_changesets
                   @project.reload
                   get :show, :id => PRJ_ID
                   assert_select 'form#revision_selector[action=?]', '/projects/subproject1/repository/show' do
                     assert_select 'select[name=branch]' do
                       assert_select 'option[value=?]', 'test-branch-01'
                     end
                   end
                 end
                 def test_show_branch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                    [
                       'default',
                       @branch_char_1,
                       'branch (1)[2]&,%.-3_4',
                       @branch_char_0,
                       'test_branch.latin-1',
                       'test-branch-00',
                   ].each do |bra|
                     get :show, :id => PRJ_ID, :rev => bra
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert assigns(:entries).size > 0
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_show_tag
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                    [
                     @tag_char_1,
                     'tag_test.00',
                     'tag-init-revision'
                   ].each do |tag|
                     get :show, :id => PRJ_ID, :rev => tag
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert assigns(:entries).size > 0
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_changes
                   get :changes, :id => PRJ_ID,
                       :path => repository_path_hash(['images', 'edit.png'])[:param]
                   assert_response :success
                   assert_template 'changes'
                   assert_select 'h2', :text => /edit.png/
                 end
                 def test_entry_show
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'entry'
                   # Line 10
                   assert_select 'tr#L10 td.line-code', :text => /WITHOUT ANY WARRANTY/
                 end
                 def test_entry_show_latin_1_path
                   [21, '21', 'adf805632193'].each do |r1|
                     get :entry, :id => PRJ_ID,
                         :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}-2.txt"])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'entry'
                     assert_select 'tr#L1 td.line-code', :text => /Mercurial is a distributed version control system/
                   end
                 end
                 def test_entry_show_latin_1_contents
                   with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                     [27, '27', '7bbf4c738e71'].each do |r1|
                       get :entry, :id => PRJ_ID,
                           :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
                           :rev => r1
                       assert_response :success
                       assert_template 'entry'
                       assert_select 'tr#L1 td.line-code', :text => /test-#{@char_1}.txt/
                     end
                   end
                 end
                 def test_entry_download
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
                       :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
                 def test_entry_binary_force_download
-                  get :entry, :id => PRJ_ID, :rev => 1,
+                  # TODO: add a binary file which is not an image to the test repo
-                      :path => repository_path_hash(['images', 'edit.png'])[:param]
-                  assert_response :success
-                  assert_equal 'image/png', @response.content_type
                 end
                 def test_directory_entry
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [4, '4', 'def6d2f1254a'].each do |r1|
                     # Full diff of changeset 4
                     ['inline', 'sbs'].each do |dt|
                       get :diff, :id => PRJ_ID, :rev => r1, :type => dt
                       assert_response :success
                       assert_template 'diff'
                       if @diff_c_support
                         # Line 22 removed
                         assert_select 'th.line-num:contains(22) ~ td.diff_out', :text => /def remove/
                         assert_select 'h2', :text => /4:def6d2f1254a/
                       end
                     end
                   end
                 end
                 def test_diff_two_revs
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [2, '400bb8672109', '400', 400].each do |r1|
                     [4, 'def6d2f1254a'].each do |r2|
                       ['inline', 'sbs'].each do |dt|
                         get :diff,
                             :id     => PRJ_ID,
                             :rev    => r1,
                             :rev_to => r2,
                             :type => dt
                         assert_response :success
                         assert_template 'diff'
                         diff = assigns(:diff)
                         assert_not_nil diff
                         assert_select 'h2', :text => /4:def6d2f1254a 2:400bb8672109/
                       end
                     end
                   end
                 end
                 def test_diff_latin_1_path
                   with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                     [21, 'adf805632193'].each do |r1|
                       ['inline', 'sbs'].each do |dt|
                         get :diff, :id => PRJ_ID, :rev => r1, :type => dt
                         assert_response :success
                         assert_template 'diff'
                         assert_select 'table' do
                           assert_select 'thead th.filename', :text => /latin-1-dir\/test-#{@char_1}-2.txt/
                           assert_select 'tbody td.diff_in', :text => /It is written in Python/
                         end
                       end
                     end
                   end
                 end
                 def test_diff_should_show_modified_filenames
                   get :diff, :id => PRJ_ID, :rev => '400bb8672109', :type => 'inline'
                   assert_response :success
                   assert_template 'diff'
                   assert_select 'th.filename', :text => 'sources/watchers_controller.rb'
                 end
                 def test_diff_should_show_deleted_filenames
                   get :diff, :id => PRJ_ID, :rev => 'b3a615152df8', :type => 'inline'
                   assert_response :success
                   assert_template 'diff'
                   assert_select 'th.filename', :text => 'sources/welcome_controller.rb'
                 end
                 def test_annotate
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'annotate'
                   # Line 22, revision 4:def6d2f1254a
                   assert_select 'tr' do
                     assert_select 'th.line-num', :text => '22'
                     assert_select 'td.revision', :text => '4:def6d2f1254a'
                     assert_select 'td.author', :text => 'jsmith'
                     assert_select 'td', :text => /remove_watcher/
                   end
                 end
                 def test_annotate_not_in_tip
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'welcome_controller.rb'])[:param]
                   assert_response 404
                   assert_select_error /was not found/
                 end
                 def test_annotate_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [2, '400bb8672109', '400', 400].each do |r1|
                     get :annotate, :id => PRJ_ID, :rev => r1,
                         :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                     assert_response :success
                     assert_template 'annotate'
                     assert_select 'h2', :text => /@ 2:400bb8672109/
                   end
                 end
                 def test_annotate_latin_1_path
                   [21, '21', 'adf805632193'].each do |r1|
                     get :annotate, :id => PRJ_ID,
                         :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}-2.txt"])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'annotate'
                     assert_select "th.line-num", :text => '1' do
                       assert_select "+ td.revision" do
                         assert_select "a", :text => '20:709858aafd1b'
                         assert_select "+ td.author", :text => "jsmith" do
                           assert_select "+ td",
                                         :text => "Mercurial is a distributed version control system."
                         end
                       end
                     end
                   end
                 end
                 def test_annotate_latin_1_contents
                   with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                     [27, '7bbf4c738e71'].each do |r1|
                       get :annotate, :id => PRJ_ID,
                           :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
                           :rev => r1
                       assert_select 'tr#L1 td.line-code', :text => /test-#{@char_1}.txt/
                     end
                   end
                 end
                 def test_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['1', '9d5b5b', '9d5b5b004199'].each do |r|
                     with_settings :default_language => "en" do
                       get :revision, :id => PRJ_ID, :rev => r
                       assert_response :success
                       assert_template 'revision'
                       assert_select 'title',
                                     :text => 'Revision 1:9d5b5b004199 - Added 2 files and modified one. - eCookbook Subproject 1 - Redmine'
                       end
                   end
                 end
                 def test_empty_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     get :revision, :id => PRJ_ID, :rev => r
                     assert_response 404
                     assert_select_error /was not found/
                   end
                 end
                 def test_destroy_valid_repository
                   @request.session[:user_id] = 1 # admin
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
                 def test_destroy_invalid_repository
                   @request.session[:user_id] = 1 # admin
                   @project.repository.destroy
                   @repository = Repository::Mercurial.create!(
                                   :project => Project.find(PRJ_ID),
                                   :url     => "/invalid",
                                   :path_encoding => 'ISO-8859-1'
                                   )
                   @repository.fetch_changesets
                   assert_equal 0, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
               else
                 puts "Mercurial test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/functional/repositories_subversion_controller_test.rb +2 -2

             # Redmine - project management software
             # Copyright (C) 2006-2016  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__)
             class RepositoriesSubversionControllerTest < ActionController::TestCase
               tests RepositoriesController
               fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles, :enabled_modules,
                        :repositories, :issues, :issue_statuses, :changesets, :changes,
                        :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
               PRJ_ID = 3
               NUM_REV = 11
               def setup
                 Setting.default_language = 'en'
                 User.current = nil
                 @project = Project.find(PRJ_ID)
                 @repository = Repository::Subversion.create(:project => @project,
                            :url => self.class.subversion_repository_url)
                 assert @repository
               end
               if repository_configured?('subversion')
                 def test_new
                   @request.session[:user_id] = 1
                   @project.repository.destroy
                   get :new, :project_id => 'subproject1', :repository_scm => 'Subversion'
                   assert_response :success
                   assert_template 'new'
                   assert_kind_of Repository::Subversion, assigns(:repository)
                   assert assigns(:repository).new_record?
                 end
                 def test_show
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                   entry = assigns(:entries).detect {|e| e.name == 'subversion_test'}
                   assert_not_nil entry
                   assert_equal 'dir', entry.kind
                   assert_select 'tr.dir a[href="/projects/subproject1/repository/show/subversion_test"]'
                   assert_select 'input[name=rev]'
                   assert_select 'a', :text => 'Statistics'
                   assert_select 'a', :text => 'Atom'
                   assert_select 'a[href=?]', '/projects/subproject1/repository', :text => 'root'
                 end
                 def test_show_non_default
                   Repository::Subversion.create(:project => @project,
                     :url => self.class.subversion_repository_url,
                     :is_default => false, :identifier => 'svn')
                   get :show, :id => PRJ_ID, :repository_id => 'svn'
                   assert_response :success
                   assert_template 'show'
                   assert_select 'tr.dir a[href="/projects/subproject1/repository/svn/show/subversion_test"]'
                   # Repository menu should link to the main repo
                   assert_select '#main-menu a[href="/projects/subproject1/repository"]'
                 end
                 def test_browse_directory
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['subversion_test'])[:param]
                   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_select 'a.text-x-c', :text => 'helloworld.c'
                 end
                 def test_browse_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['subversion_test'])[:param],
                       :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
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :changes, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'folder', 'helloworld.rb'])[:param]
                   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_select 'ul li' do
                       assert_select 'b', :text => 'svn:eol-style'
                       assert_select 'span', :text => 'native'
                     end
                   end
                 end
                 def test_directory_changes
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :changes, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'folder'])[:param]
                   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
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'helloworld.c'])[:param]
                   assert_response :success
                   assert_template 'entry'
                 end
                 def test_entry_should_send_if_too_big
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # no files in the test repo is larger than 1KB...
                   with_settings :file_max_size_displayed => 0 do
                     get :entry, :id => PRJ_ID,
                         :path => repository_path_hash(['subversion_test', 'helloworld.c'])[:param]
                     assert_response :success
                     assert_equal 'attachment; filename="helloworld.c"',
                                  @response.headers['Content-Disposition']
                   end
                 end
-                def test_entry_should_send_images_inline
+                def test_entry_should_display_images
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'folder', 'subfolder', 'rubylogo.gif'])[:param]
                   assert_response :success
-                  assert_equal 'inline; filename="rubylogo.gif"', response.headers['Content-Disposition']
+                  assert_template 'entry'
                 end
                 def test_entry_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'helloworld.rb'])[:param],
                       :rev => 2
                   assert_response :success
                   assert_template 'entry'
                   # this line was removed in r3 and file was moved in r6
                   assert_select 'td.line-code', :text => /Here's the code/
                 end
                 def test_entry_not_found
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'zzz.c'])[:param]
                   assert_select 'p#errorExplanation', :text => /The entry or revision was not found in the repository/
                 end
                 def test_entry_download
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :raw, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'helloworld.c'])[:param]
                   assert_response :success
                   assert_equal 'attachment; filename="helloworld.c"', @response.headers['Content-Disposition']
                 end
                 def test_directory_entry
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'folder'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'folder', assigns(:entry).name
                 end
                 # TODO: this test needs fixtures.
                 def test_revision
                   get :revision, :id => 1, :rev => 2
                   assert_response :success
                   assert_template 'revision'
                   assert_select 'ul' do
                     assert_select 'li' do
                       # link to the entry at rev 2
                       assert_select 'a[href=?]', '/projects/ecookbook/repository/revisions/2/entry/test/some/path/in/the/repo', :text => 'repo'
                       # link to partial diff
                       assert_select 'a[href=?]', '/projects/ecookbook/repository/revisions/2/diff/test/some/path/in/the/repo'
                     end
                   end
                 end
                 def test_invalid_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :revision, :id => PRJ_ID, :rev => 'something_weird'
                   assert_response 404
                   assert_select_error /was not found/
                 end
                 def test_invalid_revision_diff
                   get :diff, :id => PRJ_ID, :rev => '1', :rev_to => 'something_weird'
                   assert_response 404
                   assert_select_error /was not found/
                 end
                 def test_empty_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     get :revision, :id => PRJ_ID, :rev => r
                     assert_response 404
                     assert_select_error /was not found/
                   end
                 end
                 # TODO: this test needs fixtures.
                 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_select 'ul' do
                     assert_select 'li' do
                       # link to the entry at rev 2
                       assert_select 'a[href=?]', '/projects/ecookbook/repository/revisions/2/entry/path/in/the/repo', :text => 'repo'
                       # link to partial diff
                       assert_select 'a[href=?]', '/projects/ecookbook/repository/revisions/2/diff/path/in/the/repo'
                     end
                   end
                 end
                 def test_revision_diff
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['inline', 'sbs'].each do |dt|
                     get :diff, :id => PRJ_ID, :rev => 3, :type => dt
                     assert_response :success
                     assert_template 'diff'
                     assert_select 'h2', :text => /Revision 3/
                     assert_select 'th.filename', :text => 'subversion_test/textfile.txt'
                   end
                 end
                 def test_revision_diff_raw_format
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :diff, :id => PRJ_ID, :rev => 5, :format => 'diff'
                   assert_response :success
                   assert_equal 'text/x-patch', @response.content_type
                   assert_equal 'Index: subversion_test/folder/greeter.rb', @response.body.split(/\r?\n/).first
                 end
                 def test_directory_diff
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['inline', 'sbs'].each do |dt|
                     get :diff, :id => PRJ_ID, :rev => 6, :rev_to => 2,
                         :path => repository_path_hash(['subversion_test', 'folder'])[:param],
                         :type => dt
                     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_select 'h2', :text => /2:6/
                   end
                 end
                 def test_annotate
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'helloworld.c'])[:param]
                   assert_response :success
                   assert_template 'annotate'
                   assert_select 'tr' do
                     assert_select 'th.line-num', :text => '1'
                     assert_select 'td.revision', :text => '4'
                     assert_select 'td.author', :text => 'jp'
                     assert_select 'td', :text => /stdio.h/
                   end
                   # Same revision
                   assert_select 'tr' do
                     assert_select 'th.line-num', :text => '2'
                     assert_select 'td.revision', :text => ''
                     assert_select 'td.author', :text => ''
                   end
                 end
                 def test_annotate_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :annotate, :id => PRJ_ID, :rev => 8,
                       :path => repository_path_hash(['subversion_test', 'helloworld.c'])[:param]
                   assert_response :success
                   assert_template 'annotate'
                   assert_select 'h2', :text => /@ 8/
                 end
                 def test_destroy_valid_repository
                   @request.session[:user_id] = 1 # admin
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
                 def test_destroy_invalid_repository
                   @request.session[:user_id] = 1 # admin
                   @project.repository.destroy
                   @repository = Repository::Subversion.create!(
                                    :project => @project,
                                    :url     => "file:///invalid")
                   @repository.fetch_changesets
                   assert_equal 0, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 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