jro_apps/redmine Commit - r10836:3976d5e7408d

Use #assert_select instead of #assert_tag....

Jean-Philippe Lang -

r10836:3976d5e7408d

parent child

Context file:

r10836:3976d5e7408d

Collapse all files

app/views/context_menus/issues.html.erb +1 -1

             <ul>
               <%= call_hook(:view_issues_context_menu_start, {:issues => @issues, :can => @can, :back => @back }) %>
             <% if !@issue.nil? -%>
               <li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
                       :class => 'icon-edit', :disabled => !@can[:edit] %></li>
             <% else %>
               <li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'bulk_edit', :ids => @issue_ids},
                       :class => 'icon-edit', :disabled => !@can[:edit] %></li>
             <% end %>
               <% if @allowed_statuses.present? %>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_status) %></a>
                 <ul>
                 <% @allowed_statuses.each do |s| -%>
                     <li><%= context_menu_link h(s.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issue_ids, :issue => {:status_id => s}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && s == @issue.status), :disabled => !@can[:update] %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% unless @trackers.nil? %>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_tracker) %></a>
                 <ul>
                 <% @trackers.each do |t| -%>
                     <li><%= context_menu_link h(t.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issue_ids, :issue => {'tracker_id' => t}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && t == @issue.tracker), :disabled => !@can[:edit] %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% if @safe_attributes.include?('priority_id') -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_priority) %></a>
                 <ul>
                 <% @priorities.each do |p| -%>
                     <li><%= context_menu_link h(p.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issue_ids, :issue => {'priority_id' => p}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% if @safe_attributes.include?('fixed_version_id') && @versions.any? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
                 <ul>
                 <% @versions.sort.each do |v| -%>
                     <li><%= context_menu_link format_version_name(v), {:controller => 'issues', :action => 'bulk_update', :ids => @issue_ids, :issue => {'fixed_version_id' => v}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && v == @issue.fixed_version), :disabled => !@can[:update] %></li>
                 <% end -%>
                     <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_update', :ids => @issue_ids, :issue => {'fixed_version_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && @issue.fixed_version.nil?), :disabled => !@can[:update] %></li>
                 </ul>
               </li>
               <% end %>
               <% if @safe_attributes.include?('assigned_to_id') && @assignables.present? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
                 <ul>
                 <% if @assignables.include?(User.current) %>
                     <li><%= context_menu_link "<< #{l(:label_me)} >>", {:controller => 'issues', :action => 'bulk_update', :ids => @issue_ids, :issue => {'assigned_to_id' => User.current}, :back_url => @back}, :method => :post,
                                               :disabled => !@can[:update] %></li>
                 <% end %>
                 <% @assignables.each do |u| -%>
                     <li><%= context_menu_link h(u.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issue_ids, :issue => {'assigned_to_id' => u}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && u == @issue.assigned_to), :disabled => !@can[:update] %></li>
                 <% end -%>
                     <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'bulk_update', :ids => @issue_ids, :issue => {'assigned_to_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && @issue.assigned_to.nil?), :disabled => !@can[:update] %></li>
                 </ul>
               </li>
               <% end %>
               <% if @safe_attributes.include?('category_id') && @project && @project.issue_categories.any? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_category) %></a>
                 <ul>
                 <% @project.issue_categories.each do |u| -%>
                     <li><%= context_menu_link h(u.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issue_ids, :issue => {'category_id' => u}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && u == @issue.category), :disabled => !@can[:update] %></li>
                 <% end -%>
                     <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_update', :ids => @issue_ids, :issue => {'category_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && @issue.category.nil?), :disabled => !@can[:update] %></li>
                 </ul>
               </li>
               <% end -%>
               <% if @safe_attributes.include?('done_ratio') && Issue.use_field_for_done_ratio? %>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
                 <ul>
                 <% (0..10).map{|x|x*10}.each do |p| -%>
                     <li><%= context_menu_link "#{p}%", {:controller => 'issues', :action => 'bulk_update', :ids => @issue_ids, :issue => {'done_ratio' => p}, :back_url => @back}, :method => :post,
                                                   :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% @options_by_custom_field.each do |field, options| %>
-                <li class="folder">
+                <li class="folder cf_<%= field.id %>">
                   <a href="#" class="submenu"><%= h(field.name) %></a>
                   <ul>
                   <% options.each do |text, value| %>
                     <li><%= bulk_update_custom_field_context_menu_link(field, text, value || text) %></li>
                   <% end %>
                   <% unless field.is_required? %>
                     <li><%= bulk_update_custom_field_context_menu_link(field, l(:label_none), '') %></li>
                   <% end %>
                   </ul>
                 </li>
               <% end %>
             <% if !@issue.nil? %>
               <% if @can[:log_time] -%>
               <li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue},
                       :class => 'icon-time-add' %></li>
               <% end %>
               <% if User.current.logged? %>
               <li><%= watcher_link(@issue, User.current) %></li>
               <% end %>
             <% end %>
             <% if @issue.present? %>
               <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
                       :class => 'icon-copy', :disabled => !@can[:copy] %></li>
             <% else %>
               <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'bulk_edit', :ids => @issue_ids, :copy => '1'},
                                       :class => 'icon-copy', :disabled => !@can[:move] %></li>
             <% end %>
               <li><%= context_menu_link l(:button_delete), issues_path(:ids => @issue_ids, :back_url => @back),
                                         :method => :delete, :data => {:confirm => issues_destroy_confirmation_message(@issues)}, :class => 'icon-del', :disabled => !@can[:delete] %></li>
               <%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>
             </ul>

test/functional/account_controller_test.rb +2 -2

             # Redmine - project management software
             # Copyright (C) 2006-2012  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 AccountControllerTest < ActionController::TestCase
               fixtures :users, :roles
               def setup
                 User.current = nil
               end
               def test_get_login
                 get :login
                 assert_response :success
                 assert_template 'login'
                 assert_select 'input[name=username]'
                 assert_select 'input[name=password]'
               end
               def test_login_should_redirect_to_back_url_param
                 # request.uri is "test.host" in test environment
                 post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http://test.host/issues/show/1'
                 assert_redirected_to '/issues/show/1'
               end
               def test_login_should_not_redirect_to_another_host
                 post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http://test.foo/fake'
                 assert_redirected_to '/my/page'
               end
               def test_login_with_wrong_password
                 post :login, :username => 'admin', :password => 'bad'
                 assert_response :success
                 assert_template 'login'
                 assert_select 'div.flash.error', :text => /Invalid user or password/
                 assert_select 'input[name=username][value=admin]'
                 assert_select 'input[name=password]'
                 assert_select 'input[name=password][value]', 0
               end
               def test_login_should_rescue_auth_source_exception
                 source = AuthSource.create!(:name => 'Test')
                 User.find(2).update_attribute :auth_source_id, source.id
                 AuthSource.any_instance.stubs(:authenticate).raises(AuthSourceException.new("Something wrong"))
                 post :login, :username => 'jsmith', :password => 'jsmith'
                 assert_response 500
                 assert_error_tag :content => /Something wrong/
               end
               def test_login_should_reset_session
                 @controller.expects(:reset_session).once
                 post :login, :username => 'jsmith', :password => 'jsmith'
                 assert_response 302
               end
               def test_logout
                 @request.session[:user_id] = 2
                 get :logout
                 assert_redirected_to '/'
                 assert_nil @request.session[:user_id]
               end
               def test_logout_should_reset_session
                 @controller.expects(:reset_session).once
                 @request.session[:user_id] = 2
                 get :logout
                 assert_response 302
               end
               def test_get_register_with_registration_on
                 with_settings :self_registration => '3' do
                   get :register
                   assert_response :success
                   assert_template 'register'
                   assert_not_nil assigns(:user)
-                  assert_tag 'input', :attributes => {:name => 'user[password]'}
+                  assert_select 'input[name=?]', 'user[password]'
-                  assert_tag 'input', :attributes => {:name => 'user[password_confirmation]'}
+                  assert_select 'input[name=?]', 'user[password_confirmation]'
                 end
               end
               def test_get_register_should_detect_user_language
                 with_settings :self_registration => '3' do
                   @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
                   get :register
                   assert_response :success
                   assert_not_nil assigns(:user)
                   assert_equal 'fr', assigns(:user).language
                   assert_select 'select[name=?]', 'user[language]' do
                     assert_select 'option[value=fr][selected=selected]'
                   end
                 end
               end
               def test_get_register_with_registration_off_should_redirect
                 with_settings :self_registration => '0' do
                   get :register
                   assert_redirected_to '/'
                 end
               end
               # See integration/account_test.rb for the full test
               def test_post_register_with_registration_on
                 with_settings :self_registration => '3' do
                   assert_difference 'User.count' do
                     post :register, :user => {
                       :login => 'register',
                       :password => 'secret123',
                       :password_confirmation => 'secret123',
                       :firstname => 'John',
                       :lastname => 'Doe',
                       :mail => 'register@example.com'
                     }
                     assert_redirected_to '/my/account'
                   end
                   user = User.first(:order => 'id DESC')
                   assert_equal 'register', user.login
                   assert_equal 'John', user.firstname
                   assert_equal 'Doe', user.lastname
                   assert_equal 'register@example.com', user.mail
                   assert user.check_password?('secret123')
                   assert user.active?
                 end
               end
               def test_post_register_with_registration_off_should_redirect
                 with_settings :self_registration => '0' do
                   assert_no_difference 'User.count' do
                     post :register, :user => {
                       :login => 'register',
                       :password => 'test',
                       :password_confirmation => 'test',
                       :firstname => 'John',
                       :lastname => 'Doe',
                       :mail => 'register@example.com'
                     }
                     assert_redirected_to '/'
                   end
                 end
               end
               def test_get_lost_password_should_display_lost_password_form
                 get :lost_password
                 assert_response :success
                 assert_select 'input[name=mail]'
               end
               def test_lost_password_for_active_user_should_create_a_token
                 Token.delete_all
                 ActionMailer::Base.deliveries.clear
                 assert_difference 'ActionMailer::Base.deliveries.size' do
                   assert_difference 'Token.count' do
                     with_settings :host_name => 'mydomain.foo', :protocol => 'http' do
                       post :lost_password, :mail => 'JSmith@somenet.foo'
                       assert_redirected_to '/login'
                     end
                   end
                 end
                 token = Token.order('id DESC').first
                 assert_equal User.find(2), token.user
                 assert_equal 'recovery', token.action
                 assert_select_email do
                   assert_select "a[href=?]", "http://mydomain.foo/account/lost_password?token=#{token.value}"
                 end
               end
               def test_lost_password_for_unknown_user_should_fail
                 Token.delete_all
                 assert_no_difference 'Token.count' do
                   post :lost_password, :mail => 'invalid@somenet.foo'
                   assert_response :success
                 end
               end
               def test_lost_password_for_non_active_user_should_fail
                 Token.delete_all
                 assert User.find(2).lock!
                 assert_no_difference 'Token.count' do
                   post :lost_password, :mail => 'JSmith@somenet.foo'
                   assert_response :success
                 end
               end
               def test_get_lost_password_with_token_should_display_the_password_recovery_form
                 user = User.find(2)
                 token = Token.create!(:action => 'recovery', :user => user)
                 get :lost_password, :token => token.value
                 assert_response :success
                 assert_template 'password_recovery'
                 assert_select 'input[type=hidden][name=token][value=?]', token.value
               end
               def test_get_lost_password_with_invalid_token_should_redirect
                 get :lost_password, :token => "abcdef"
                 assert_redirected_to '/'
               end
               def test_post_lost_password_with_token_should_change_the_user_password
                 user = User.find(2)
                 token = Token.create!(:action => 'recovery', :user => user)
                 post :lost_password, :token => token.value, :new_password => 'newpass123', :new_password_confirmation => 'newpass123'
                 assert_redirected_to '/login'
                 user.reload
                 assert user.check_password?('newpass123')
                 assert_nil Token.find_by_id(token.id), "Token was not deleted"
               end
               def test_post_lost_password_with_token_for_non_active_user_should_fail
                 user = User.find(2)
                 token = Token.create!(:action => 'recovery', :user => user)
                 user.lock!
                 post :lost_password, :token => token.value, :new_password => 'newpass123', :new_password_confirmation => 'newpass123'
                 assert_redirected_to '/'
                 assert ! user.check_password?('newpass123')
               end
               def test_post_lost_password_with_token_and_password_confirmation_failure_should_redisplay_the_form
                 user = User.find(2)
                 token = Token.create!(:action => 'recovery', :user => user)
                 post :lost_password, :token => token.value, :new_password => 'newpass', :new_password_confirmation => 'wrongpass'
                 assert_response :success
                 assert_template 'password_recovery'
                 assert_not_nil Token.find_by_id(token.id), "Token was deleted"
                 assert_select 'input[type=hidden][name=token][value=?]', token.value
               end
               def test_post_lost_password_with_invalid_token_should_redirect
                 post :lost_password, :token => "abcdef", :new_password => 'newpass', :new_password_confirmation => 'newpass'
                 assert_redirected_to '/'
               end
             end

test/functional/activities_controller_test.rb +25 -57

             # Redmine - project management software
             # Copyright (C) 2006-2012  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 ActivitiesControllerTest < ActionController::TestCase
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :groups_users,
                        :enabled_modules,
                        :workflows,
                        :journals, :journal_details
               def test_project_index
                 get :index, :id => 1, :with_subprojects => 0
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:events_by_day)
-                assert_tag :tag => "h3",
+                assert_select 'h3', :text => /#{2.days.ago.to_date.day}/
-                           :content => /#{2.days.ago.to_date.day}/,
+                assert_select 'dl dt.issue-edit a', :text => /(#{IssueStatus.find(2).name})/
-                           :sibling => { :tag => "dl",
-                             :child => { :tag => "dt",
-                               :attributes => { :class => /issue-edit/ },
-                               :child => { :tag => "a",
-                                 :content => /(#{IssueStatus.find(2).name})/,
               end
               def test_project_index_with_invalid_project_id_should_respond_404
                 get :index, :id => 299
                 assert_response 404
               end
               def test_previous_project_index
                 get :index, :id => 1, :from => 3.days.ago.to_date
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:events_by_day)
-                assert_tag :tag => "h3",
+                assert_select 'h3', :text => /#{3.days.ago.to_date.day}/
-                           :content => /#{3.day.ago.to_date.day}/,
+                assert_select 'dl dt.issue a', :text => /Can&#x27;t print recipes/
-                           :sibling => { :tag => "dl",
-                             :child => { :tag => "dt",
-                               :attributes => { :class => /issue/ },
-                               :child => { :tag => "a",
-                                 :content => /Can&#x27;t print recipes/,
               end
               def test_global_index
                 @request.session[:user_id] = 1
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:events_by_day)
                 i5 = Issue.find(5)
                 d5 = User.find(1).time_to_date(i5.created_on)
-                assert_tag :tag => "h3",
-                           :content => /#{d5.day}/,
+                assert_select 'h3', :text => /#{d5.day}/
-                           :sibling => { :tag => "dl",
+                assert_select 'dl dt.issue a', :text => /Subproject issue/
-                             :child => { :tag => "dt",
-                               :attributes => { :class => /issue/ },
-                               :child => { :tag => "a",
-                                 :content => /Subproject issue/,
               end
               def test_user_index
                 @request.session[:user_id] = 1
                 get :index, :user_id => 2
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:events_by_day)
                 assert_select 'h2 a[href=/users/2]', :text => 'John Smith'
                 i1 = Issue.find(1)
                 d1 = User.find(1).time_to_date(i1.created_on)
-                assert_tag :tag => "h3",
+                assert_select 'h3', :text => /#{d1.day}/
-                           :content => /#{d1.day}/,
+                assert_select 'dl dt.issue a', :text => /Can&#x27;t print recipes/
-                           :sibling => { :tag => "dl",
-                             :child => { :tag => "dt",
-                               :attributes => { :class => /issue/ },
-                               :child => { :tag => "a",
-                                 :content => /Can&#x27;t print recipes/,
               end
               def test_user_index_with_invalid_user_id_should_respond_404
                 get :index, :user_id => 299
                 assert_response 404
               end
               def test_index_atom_feed
                 get :index, :format => 'atom', :with_subprojects => 0
                 assert_response :success
                 assert_template 'common/feed'
-                assert_tag :tag => 'link', :parent =>  {:tag => 'feed', :parent => nil },
+                assert_select 'feed' do
-                    :attributes => {:rel => 'self', :href => 'http://test.host/activity.atom?with_subprojects=0'}
+                  assert_select 'link[rel=self][href=?]', 'http://test.host/activity.atom?with_subprojects=0'
-                assert_tag :tag => 'link', :parent =>  {:tag => 'feed', :parent => nil },
+                  assert_select 'link[rel=alternate][href=?]', 'http://test.host/activity?with_subprojects=0'
-                    :attributes => {:rel => 'alternate', :href => 'http://test.host/activity?with_subprojects=0'}
+                  assert_select 'entry' do
+                    assert_select 'link[href=?]', 'http://test.host/issues/11'
-                assert_tag :tag => 'entry', :child => {
+                  end
-                  :tag => 'link',
+                end
-                  :attributes => {:href => 'http://test.host/issues/11'}}
               end
               def test_index_atom_feed_with_explicit_selection
                 get :index, :format => 'atom', :with_subprojects => 0,
                   :show_changesets => 1,
                   :show_documents => 1,
                   :show_files => 1,
                   :show_issues => 1,
                   :show_messages => 1,
                   :show_news => 1,
                   :show_time_entries => 1,
                   :show_wiki_edits => 1
                 assert_response :success
                 assert_template 'common/feed'
-                assert_tag :tag => 'link', :parent =>  {:tag => 'feed', :parent => nil },
+                assert_select 'feed' do
-                    :attributes => {:rel => 'self', :href => 'http://test.host/activity.atom?show_changesets=1&amp;show_documents=1&amp;show_files=1&amp;show_issues=1&amp;show_messages=1&amp;show_news=1&amp;show_time_entries=1&amp;show_wiki_edits=1&amp;with_subprojects=0'}
+                  assert_select 'link[rel=self][href=?]', 'http://test.host/activity.atom?show_changesets=1&amp;show_documents=1&amp;show_files=1&amp;show_issues=1&amp;show_messages=1&amp;show_news=1&amp;show_time_entries=1&amp;show_wiki_edits=1&amp;with_subprojects=0'
-                assert_tag :tag => 'link', :parent => {:tag => 'feed', :parent => nil },
+                  assert_select 'link[rel=alternate][href=?]', 'http://test.host/activity?show_changesets=1&amp;show_documents=1&amp;show_files=1&amp;show_issues=1&amp;show_messages=1&amp;show_news=1&amp;show_time_entries=1&amp;show_wiki_edits=1&amp;with_subprojects=0'
-                    :attributes => {:rel => 'alternate', :href => 'http://test.host/activity?show_changesets=1&amp;show_documents=1&amp;show_files=1&amp;show_issues=1&amp;show_messages=1&amp;show_news=1&amp;show_time_entries=1&amp;show_wiki_edits=1&amp;with_subprojects=0'}
+                  assert_select 'entry' do
+                    assert_select 'link[href=?]', 'http://test.host/issues/11'
-                assert_tag :tag => 'entry', :child => {
+                  end
-                  :tag => 'link',
+                end
-                  :attributes => {:href => 'http://test.host/issues/11'}}
               end
               def test_index_atom_feed_with_one_item_type
                 get :index, :format => 'atom', :show_issues => '1'
                 assert_response :success
                 assert_template 'common/feed'
-                assert_tag :tag => 'title', :content => /Issues/
+                assert_select 'title', :text => /Issues/
               end
               def test_index_should_show_private_notes_with_permission_only
                 journal = Journal.create!(:journalized => Issue.find(2), :notes => 'Private notes with searchkeyword', :private_notes => true)
                 @request.session[:user_id] = 2
                 get :index
                 assert_response :success
                 assert_include journal, assigns(:events_by_day).values.flatten
                 Role.find(1).remove_permission! :view_private_notes
                 get :index
                 assert_response :success
                 assert_not_include journal, assigns(:events_by_day).values.flatten
               end
             end

test/functional/boards_controller_test.rb +3 -2

             # Redmine - project management software
             # Copyright (C) 2006-2012  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 BoardsControllerTest < ActionController::TestCase
               fixtures :projects, :users, :members, :member_roles, :roles, :boards, :messages, :enabled_modules
               def setup
                 User.current = nil
               end
               def test_index
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:boards)
                 assert_not_nil assigns(:project)
               end
               def test_index_not_found
                 get :index, :project_id => 97
                 assert_response 404
               end
               def test_index_should_show_messages_if_only_one_board
                 Project.find(1).boards.slice(1..-1).each(&:destroy)
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:topics)
               end
               def test_show
                 get :show, :project_id => 1, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:board)
                 assert_not_nil assigns(:project)
                 assert_not_nil assigns(:topics)
               end
               def test_show_should_display_sticky_messages_first
                 Message.update_all(:sticky => 0)
                 Message.update_all({:sticky => 1}, {:id => 1})
                 get :show, :project_id => 1, :id => 1
                 assert_response :success
                 topics = assigns(:topics)
                 assert_not_nil topics
                 assert topics.size > 1, "topics size was #{topics.size}"
                 assert topics.first.sticky?
                 assert topics.first.updated_on < topics.second.updated_on
               end
               def test_show_with_permission_should_display_the_new_message_form
                 @request.session[:user_id] = 2
                 get :show, :project_id => 1, :id => 1
                 assert_response :success
                 assert_template 'show'
-                assert_tag 'form', :attributes => {:id => 'message-form'}
+                assert_select 'form#message-form' do
-                assert_tag 'input', :attributes => {:name => 'message[subject]'}
+                  assert_select 'input[name=?]', 'message[subject]'
+                end
               end
               def test_show_atom
                 get :show, :project_id => 1, :id => 1, :format => 'atom'
                 assert_response :success
                 assert_template 'common/feed'
                 assert_not_nil assigns(:board)
                 assert_not_nil assigns(:project)
                 assert_not_nil assigns(:messages)
               end
               def test_show_not_found
                 get :index, :project_id => 1, :id => 97
                 assert_response 404
               end
               def test_new
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
                 assert_select 'select[name=?]', 'board[parent_id]' do
                   assert_select 'option', (Project.find(1).boards.size + 1)
                   assert_select 'option[value=]', :text => ''
                   assert_select 'option[value=1]', :text => 'Help'
                 end
               end
               def test_new_without_project_boards
                 Project.find(1).boards.delete_all
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
                 assert_select 'select[name=?]', 'board[parent_id]', 0
               end
               def test_create
                 @request.session[:user_id] = 2
                 assert_difference 'Board.count' do
                   post :create, :project_id => 1, :board => { :name => 'Testing', :description => 'Testing board creation'}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/boards'
                 board = Board.first(:order => 'id DESC')
                 assert_equal 'Testing', board.name
                 assert_equal 'Testing board creation', board.description
               end
               def test_create_with_parent
                 @request.session[:user_id] = 2
                 assert_difference 'Board.count' do
                   post :create, :project_id => 1, :board => { :name => 'Testing', :description => 'Testing', :parent_id => 2}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/boards'
                 board = Board.first(:order => 'id DESC')
                 assert_equal Board.find(2), board.parent
               end
               def test_create_with_failure
                 @request.session[:user_id] = 2
                 assert_no_difference 'Board.count' do
                   post :create, :project_id => 1, :board => { :name => '', :description => 'Testing board creation'}
                 end
                 assert_response :success
                 assert_template 'new'
               end
               def test_edit
                 @request.session[:user_id] = 2
                 get :edit, :project_id => 1, :id => 2
                 assert_response :success
                 assert_template 'edit'
               end
               def test_edit_with_parent
                 board = Board.generate!(:project_id => 1, :parent_id => 2)
                 @request.session[:user_id] = 2
                 get :edit, :project_id => 1, :id => board.id
                 assert_response :success
                 assert_template 'edit'
                 assert_select 'select[name=?]', 'board[parent_id]' do
                   assert_select 'option[value=2][selected=selected]'
                 end
               end
               def test_update
                 @request.session[:user_id] = 2
                 assert_no_difference 'Board.count' do
                   put :update, :project_id => 1, :id => 2, :board => { :name => 'Testing', :description => 'Testing board update'}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/boards'
                 assert_equal 'Testing', Board.find(2).name
               end
               def test_update_position
                 @request.session[:user_id] = 2
                 put :update, :project_id => 1, :id => 2, :board => { :move_to => 'highest'}
                 assert_redirected_to '/projects/ecookbook/settings/boards'
                 board = Board.find(2)
                 assert_equal 1, board.position
               end
               def test_update_with_failure
                 @request.session[:user_id] = 2
                 put :update, :project_id => 1, :id => 2, :board => { :name => '', :description => 'Testing board update'}
                 assert_response :success
                 assert_template 'edit'
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 assert_difference 'Board.count', -1 do
                   delete :destroy, :project_id => 1, :id => 2
                 end
                 assert_redirected_to '/projects/ecookbook/settings/boards'
                 assert_nil Board.find_by_id(2)
               end
             end

test/functional/calendars_controller_test.rb +20 -30

             # Redmine - project management software
             # Copyright (C) 2006-2012  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 CalendarsControllerTest < ActionController::TestCase
               fixtures :projects,
                        :trackers,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules
               def test_calendar
                 get :show, :project_id => 1
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
               end
               def test_cross_project_calendar
                 get :show
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
               end
               context "GET :show" do
                 should "run custom queries" do
                   @query = IssueQuery.create!(:name => 'Calendar', :is_public => true)
                   get :show, :query_id => @query.id
                   assert_response :success
                 end
               end
               def test_week_number_calculation
                 Setting.start_of_week = 7
                 get :show, :month => '1', :year => '2010'
                 assert_response :success
-                assert_tag :tag => 'tr',
+                assert_select 'tr' do
-                  :descendant => {:tag => 'td',
+                  assert_select 'td.week-number', :text => '53'
-                                  :attributes => {:class => 'week-number'}, :content => '53'},
+                  assert_select 'td.odd', :text => '27'
-                  :descendant => {:tag => 'td',
+                  assert_select 'td.even', :text => '2'
-                                  :attributes => {:class => 'odd'}, :content => '27'},
+                end
-                  :descendant => {:tag => 'td',
-                                  :attributes => {:class => 'even'}, :content => '2'}
-                assert_tag :tag => 'tr',
-                  :descendant => {:tag => 'td',
-                                  :attributes => {:class => 'week-number'}, :content => '1'},
-                  :descendant => {:tag => 'td',
-                                  :attributes => {:class => 'odd'}, :content => '3'},
-                  :descendant => {:tag => 'td',
-                                  :attributes => {:class => 'even'}, :content => '9'}
+                assert_select 'tr' do
+                  assert_select 'td.week-number', :text => '1'
+                  assert_select 'td.odd', :text => '3'
+                  assert_select 'td.even', :text => '9'
+                end
                 Setting.start_of_week = 1
                 get :show, :month => '1', :year => '2010'
                 assert_response :success
-                assert_tag :tag => 'tr',
+                assert_select 'tr' do
-                  :descendant => {:tag => 'td',
+                  assert_select 'td.week-number', :text => '53'
-                                  :attributes => {:class => 'week-number'}, :content => '53'},
+                  assert_select 'td.even', :text => '28'
-                  :descendant => {:tag => 'td',
+                  assert_select 'td.even', :text => '3'
-                                  :attributes => {:class => 'even'}, :content => '28'},
+                end
-                  :descendant => {:tag => 'td',
-                                  :attributes => {:class => 'even'}, :content => '3'}
-                assert_tag :tag => 'tr',
-                  :descendant => {:tag => 'td',
-                                  :attributes => {:class => 'week-number'}, :content => '1'},
-                  :descendant => {:tag => 'td',
-                                  :attributes => {:class => 'even'}, :content => '4'},
-                  :descendant => {:tag => 'td',
-                                  :attributes => {:class => 'even'}, :content => '10'}
+                assert_select 'tr' do
+                  assert_select 'td.week-number', :text => '1'
+                  assert_select 'td.even', :text => '4'
+                  assert_select 'td.even', :text => '10'
+                end
               end
             end

test/functional/context_menus_controller_test.rb +83 -116

             # Redmine - project management software
             # Copyright (C) 2006-2012  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 ContextMenusControllerTest < ActionController::TestCase
               fixtures :projects,
                        :trackers,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :workflows,
                        :journals, :journal_details,
                        :versions,
                        :issues, :issue_statuses, :issue_categories,
                        :users,
                        :enumerations,
                        :time_entries
               def test_context_menu_one_issue
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
                 assert_response :success
                 assert_template 'context_menu'
-                assert_tag :tag => 'a', :content => 'Edit',
-                                        :attributes => { :href => '/issues/1/edit',
+                assert_select 'a.icon-edit[href=?]', '/issues/1/edit', :text => 'Edit'
-                                                         :class => 'icon-edit' }
+                assert_select 'a.icon-copy[href=?]', '/projects/ecookbook/issues/1/copy', :text => 'Copy'
-                assert_tag :tag => 'a', :content => 'Closed',
+                assert_select 'a.icon-del[href=?]', '/issues?ids%5B%5D=1', :text => 'Delete'
-                                        :attributes => { :href => '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bstatus_id%5D=5',
-                                                         :class => '' }
+                # Statuses
-                assert_tag :tag => 'a', :content => 'Immediate',
+                assert_select 'a[href=?]', '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bstatus_id%5D=5', :text => 'Closed'
-                                        :attributes => { :href => '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bpriority_id%5D=8',
+                assert_select 'a[href=?]', '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bpriority_id%5D=8', :text => 'Immediate'
-                                                         :class => '' }
+                # No inactive priorities
-                assert_no_tag :tag => 'a', :content => 'Inactive Priority'
+                assert_select 'a', :text => /Inactive Priority/, :count => 0
                 # Versions
-                assert_tag :tag => 'a', :content => '2.0',
+                assert_select 'a[href=?]', '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bfixed_version_id%5D=3', :text => '2.0'
-                                        :attributes => { :href => '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bfixed_version_id%5D=3',
+                assert_select 'a[href=?]', '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bfixed_version_id%5D=4', :text => 'eCookbook Subproject 1 - 2.0'
-                                                         :class => '' }
+                # Assignees
-                assert_tag :tag => 'a', :content => 'eCookbook Subproject 1 - 2.0',
+                assert_select 'a[href=?]', '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bassigned_to_id%5D=3', :text => 'Dave Lopper'
-                                        :attributes => { :href => '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bfixed_version_id%5D=4',
-                                                         :class => '' }
-                assert_tag :tag => 'a', :content => 'Dave Lopper',
-                                        :attributes => { :href => '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bassigned_to_id%5D=3',
-                                                         :class => '' }
-                assert_tag :tag => 'a', :content => 'Copy',
-                                        :attributes => { :href => '/projects/ecookbook/issues/1/copy',
-                                                         :class => 'icon-copy' }
-                assert_no_tag :tag => 'a', :content => 'Move'
-                assert_tag :tag => 'a', :content => 'Delete',
-                                        :attributes => { :href => '/issues?ids%5B%5D=1',
-                                                         :class => 'icon-del' }
               end
               def test_context_menu_one_issue_by_anonymous
                 get :issues, :ids => [1]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '#',
                                                          :class => 'icon-del disabled' }
               end
               def test_context_menu_multiple_issues_of_same_project
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1, 2]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_not_nil assigns(:issues)
                 assert_equal [1, 2], assigns(:issues).map(&:id).sort
                 ids = assigns(:issues).map(&:id).sort.map {|i| "ids%5B%5D=#{i}"}.join('&amp;')
-                assert_tag :tag => 'a', :content => 'Edit',
-                                        :attributes => { :href => "/issues/bulk_edit?#{ids}",
+                assert_select 'a.icon-edit[href=?]', "/issues/bulk_edit?#{ids}", :text => 'Edit'
-                                                         :class => 'icon-edit' }
+                assert_select 'a.icon-copy[href=?]', "/issues/bulk_edit?copy=1&amp;#{ids}", :text => 'Copy'
-                assert_tag :tag => 'a', :content => 'Closed',
+                assert_select 'a.icon-del[href=?]', "/issues?#{ids}", :text => 'Delete'
-                                        :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bstatus_id%5D=5",
-                                                         :class => '' }
+                assert_select 'a[href=?]', "/issues/bulk_update?#{ids}&amp;issue%5Bstatus_id%5D=5", :text => 'Closed'
-                assert_tag :tag => 'a', :content => 'Immediate',
+                assert_select 'a[href=?]', "/issues/bulk_update?#{ids}&amp;issue%5Bpriority_id%5D=8", :text => 'Immediate'
-                                        :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bpriority_id%5D=8",
+                assert_select 'a[href=?]', "/issues/bulk_update?#{ids}&amp;issue%5Bassigned_to_id%5D=3", :text => 'Dave Lopper'
-                                                         :class => '' }
-                assert_tag :tag => 'a', :content => 'Dave Lopper',
-                                        :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bassigned_to_id%5D=3",
-                                                         :class => '' }
-                assert_tag :tag => 'a', :content => 'Copy',
-                                        :attributes => { :href => "/issues/bulk_edit?copy=1&amp;#{ids}",
-                                                         :class => 'icon-copy' }
-                assert_no_tag :tag => 'a', :content => 'Move'
-                assert_tag :tag => 'a', :content => 'Delete',
-                                        :attributes => { :href => "/issues?#{ids}",
-                                                         :class => 'icon-del' }
               end
               def test_context_menu_multiple_issues_of_different_projects
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1, 2, 6]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_not_nil assigns(:issues)
                 assert_equal [1, 2, 6], assigns(:issues).map(&:id).sort
                 ids = assigns(:issues).map(&:id).sort.map {|i| "ids%5B%5D=#{i}"}.join('&amp;')
-                assert_tag :tag => 'a', :content => 'Edit',
-                                        :attributes => { :href => "/issues/bulk_edit?#{ids}",
+                assert_select 'a.icon-edit[href=?]', "/issues/bulk_edit?#{ids}", :text => 'Edit'
-                                                         :class => 'icon-edit' }
+                assert_select 'a.icon-del[href=?]', "/issues?#{ids}", :text => 'Delete'
-                assert_tag :tag => 'a', :content => 'Closed',
-                                        :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bstatus_id%5D=5",
+                assert_select 'a[href=?]', "/issues/bulk_update?#{ids}&amp;issue%5Bstatus_id%5D=5", :text => 'Closed'
-                                                         :class => '' }
+                assert_select 'a[href=?]', "/issues/bulk_update?#{ids}&amp;issue%5Bpriority_id%5D=8", :text => 'Immediate'
-                assert_tag :tag => 'a', :content => 'Immediate',
+                assert_select 'a[href=?]', "/issues/bulk_update?#{ids}&amp;issue%5Bassigned_to_id%5D=2", :text => 'John Smith'
-                                        :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bpriority_id%5D=8",
-                                                         :class => '' }
-                assert_tag :tag => 'a', :content => 'John Smith',
-                                        :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bassigned_to_id%5D=2",
-                                                         :class => '' }
-                assert_tag :tag => 'a', :content => 'Delete',
-                                        :attributes => { :href => "/issues?#{ids}",
-                                                         :class => 'icon-del' }
               end
               def test_context_menu_should_include_list_custom_fields
                 field = IssueCustomField.create!(:name => 'List', :field_format => 'list',
                   :possible_values => ['Foo', 'Bar'], :is_for_all => true, :tracker_ids => [1, 2, 3])
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
-                assert_tag 'a',
+                assert_select "li.cf_#{field.id}" do
-                  :content => 'List',
+                  assert_select 'a[href=#]', :text => 'List'
-                  :attributes => {:href => '#'},
+                  assert_select 'ul' do
-                  :sibling => {:tag => 'ul', :children => {:count => 3}}
+                    assert_select 'a', 3
+                    assert_select 'a[href=?]', "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=Foo", :text => 'Foo'
-                assert_tag 'a',
+                    assert_select 'a[href=?]', "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=", :text => 'none'
-                  :content => 'Foo',
+                  end
-                  :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=Foo"}
+                end
-                assert_tag 'a',
-                  :content => 'none',
-                  :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D="}
               end
               def test_context_menu_should_not_include_null_value_for_required_custom_fields
                 field = IssueCustomField.create!(:name => 'List', :is_required => true, :field_format => 'list',
                   :possible_values => ['Foo', 'Bar'], :is_for_all => true, :tracker_ids => [1, 2, 3])
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1, 2]
-                assert_tag 'a',
+                assert_select "li.cf_#{field.id}" do
-                  :content => 'List',
+                  assert_select 'a[href=#]', :text => 'List'
-                  :attributes => {:href => '#'},
+                  assert_select 'ul' do
-                  :sibling => {:tag => 'ul', :children => {:count => 2}}
+                    assert_select 'a', 2
+                    assert_select 'a', :text => 'none', :count => 0
+                  end
+                end
               end
               def test_context_menu_on_single_issue_should_select_current_custom_field_value
                 field = IssueCustomField.create!(:name => 'List', :field_format => 'list',
                   :possible_values => ['Foo', 'Bar'], :is_for_all => true, :tracker_ids => [1, 2, 3])
                 issue = Issue.find(1)
                 issue.custom_field_values = {field.id => 'Bar'}
                 issue.save!
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
-                assert_tag 'a',
+                assert_select "li.cf_#{field.id}" do
-                  :content => 'List',
+                  assert_select 'a[href=#]', :text => 'List'
-                  :attributes => {:href => '#'},
+                  assert_select 'ul' do
-                  :sibling => {:tag => 'ul', :children => {:count => 3}}
+                    assert_select 'a', 3
-                assert_tag 'a',
+                    assert_select 'a.icon-checked', :text => 'Bar'
-                  :content => 'Bar',
+                  end
-                  :attributes => {:class => /icon-checked/}
+                end
               end
               def test_context_menu_should_include_bool_custom_fields
                 field = IssueCustomField.create!(:name => 'Bool', :field_format => 'bool',
                   :is_for_all => true, :tracker_ids => [1, 2, 3])
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
-                assert_tag 'a',
+                assert_select "li.cf_#{field.id}" do
-                  :content => 'Bool',
+                  assert_select 'a[href=#]', :text => 'Bool'
-                  :attributes => {:href => '#'},
+                  assert_select 'ul' do
-                  :sibling => {:tag => 'ul', :children => {:count => 3}}
+                    assert_select 'a', 3
+                    assert_select 'a[href=?]', "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=0", :text => 'No'
-                assert_tag 'a',
+                    assert_select 'a[href=?]', "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=1", :text => 'Yes'
-                  :content => 'Yes',
+                    assert_select 'a[href=?]', "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=", :text => 'none'
-                  :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=1"}
+                  end
+                end
               end
               def test_context_menu_should_include_user_custom_fields
                 field = IssueCustomField.create!(:name => 'User', :field_format => 'user',
                   :is_for_all => true, :tracker_ids => [1, 2, 3])
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
-                assert_tag 'a',
+                assert_select "li.cf_#{field.id}" do
-                  :content => 'User',
+                  assert_select 'a[href=#]', :text => 'User'
-                  :attributes => {:href => '#'},
+                  assert_select 'ul' do
-                  :sibling => {:tag => 'ul', :children => {:count => Project.find(1).members.count + 1}}
+                    assert_select 'a', Project.find(1).members.count + 1
+                    assert_select 'a[href=?]', "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=2", :text => 'John Smith'
-                assert_tag 'a',
+                    assert_select 'a[href=?]', "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=", :text => 'none'
-                  :content => 'John Smith',
+                  end
-                  :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=2"}
+                end
               end
               def test_context_menu_should_include_version_custom_fields
                 field = IssueCustomField.create!(:name => 'Version', :field_format => 'version', :is_for_all => true, :tracker_ids => [1, 2, 3])
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
-                assert_tag 'a',
+                assert_select "li.cf_#{field.id}" do
-                  :content => 'Version',
+                  assert_select 'a[href=#]', :text => 'Version'
-                  :attributes => {:href => '#'},
+                  assert_select 'ul' do
-                  :sibling => {:tag => 'ul', :children => {:count => Project.find(1).shared_versions.count + 1}}
+                    assert_select 'a', Project.find(1).shared_versions.count + 1
+                    assert_select 'a[href=?]', "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=3", :text => '2.0'
-                assert_tag 'a',
+                    assert_select 'a[href=?]', "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=", :text => 'none'
-                  :content => '2.0',
+                  end
-                  :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=3"}
+                end
               end
               def test_context_menu_by_assignable_user_should_include_assigned_to_me_link
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
                 assert_response :success
                 assert_template 'context_menu'
-                assert_tag :tag => 'a', :content => / me /,
+                assert_select 'a[href=?]', '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bassigned_to_id%5D=2', :text => / me /
-                                        :attributes => { :href => '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bassigned_to_id%5D=2',
-                                                         :class => '' }
               end
               def test_context_menu_should_propose_shared_versions_for_issues_from_different_projects
                 @request.session[:user_id] = 2
                 version = Version.create!(:name => 'Shared', :sharing => 'system', :project_id => 1)
                 get :issues, :ids => [1, 4]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_include version, assigns(:versions)
-                assert_tag :tag => 'a', :content => 'eCookbook - Shared'
+                assert_select 'a', :text => 'eCookbook - Shared'
               end
               def test_context_menu_issue_visibility
                 get :issues, :ids => [1, 4]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_equal [1], assigns(:issues).collect(&:id)
               end
               def test_time_entries_context_menu
                 @request.session[:user_id] = 2
                 get :time_entries, :ids => [1, 2]
                 assert_response :success
                 assert_template 'time_entries'
-                assert_tag 'a', :content => 'Edit'
-                assert_no_tag 'a', :content => 'Edit', :attributes => {:class => /disabled/}
+                assert_select 'a:not(.disabled)', :text => 'Edit'
               end
               def test_time_entries_context_menu_without_edit_permission
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :edit_time_entries
                 get :time_entries, :ids => [1, 2]
                 assert_response :success
                 assert_template 'time_entries'
-                assert_tag 'a', :content => 'Edit', :attributes => {:class => /disabled/}
+                assert_select 'a.disabled', :text => 'Edit'
               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