##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r12146, r12147 and r12148 from trunk to 2.3-stable (#14931)...
Toshi MARUYAMA -
r11921:9d3377c92cbf
parent child
Show More
Side by Side Unified
Context file:
r11921:9d3377c92cbf Loading diff...:
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Hide comments
@@ -23,7 +23,8 class RepositoriesBazaarControllerTest < ActionController::TestCase
23 fixtures :projects, :users, :roles, :members, :member_roles,
23 fixtures :projects, :users, :roles, :members, :member_roles,
24 :repositories, :enabled_modules
24 :repositories, :enabled_modules
25
25
26 REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository/trunk').to_s
26 REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s
27 REPOSITORY_PATH_TRUNK = File.join(REPOSITORY_PATH, "trunk")
27 PRJ_ID = 3
28 PRJ_ID = 3
28
29
29 def setup
30 def setup
@@ -31,7 +32,7 class RepositoriesBazaarControllerTest < ActionController::TestCase
31 @project = Project.find(PRJ_ID)
32 @project = Project.find(PRJ_ID)
32 @repository = Repository::Bazaar.create(
33 @repository = Repository::Bazaar.create(
33 :project => @project,
34 :project => @project,
34 :url => REPOSITORY_PATH,
35 :url => REPOSITORY_PATH_TRUNK,
35 :log_encoding => 'UTF-8')
36 :log_encoding => 'UTF-8')
36 assert @repository
37 assert @repository
37 end
38 end
@@ -148,6 +149,28 class RepositoriesBazaarControllerTest < ActionController::TestCase
148 end
149 end
149 end
150 end
150
151
152 def test_annotate_author_escaping
153 repository = Repository::Bazaar.create(
154 :project => @project,
155 :url => File.join(REPOSITORY_PATH, "author_escaping"),
156 :identifier => 'author_escaping',
157 :log_encoding => 'UTF-8')
158 assert repository
159 get :annotate, :id => PRJ_ID, :repository_id => 'author_escaping',
160 :path => repository_path_hash(['author-escaping-test.txt'])[:param]
161 assert_response :success
162 assert_template 'annotate'
163 assert_select "th.line-num", :text => '1' do
164 assert_select "+ td.revision" do
165 assert_select "a", :text => '2'
166 assert_select "+ td.author", :text => "test &amp;" do
167 assert_select "+ td",
168 :text => "author escaping test"
169 end
170 end
171 end
172 end
173
151 def test_destroy_valid_repository
174 def test_destroy_valid_repository
152 @request.session[:user_id] = 1 # admin
175 @request.session[:user_id] = 1 # admin
153 assert_equal 0, @repository.changesets.count
176 assert_equal 0, @repository.changesets.count
General Comments 0
You need to be logged in to leave comments. Login now