diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index cbd4bd6b2..65d4dbae9 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1141,7 +1141,7 @@ div.wiki img {vertical-align:middle; max-width:100%;} line-height:1.5em; } -.mypage-box>.contextual {opacity:0; transition: opacity 0.2s;} +.mypage-box>.contextual {opacity:0.001; transition: opacity 0.2s;} .mypage-box:hover>.contextual {opacity:1;} .handle {cursor: move;} diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb index 67d339490..944640cb3 100644 --- a/test/system/issues_test.rb +++ b/test/system/issues_test.rb @@ -151,6 +151,27 @@ class IssuesTest < ApplicationSystemTestCase set_fixtures_attachments_directory end + def test_create_issue_with_new_target_version + log_user('jsmith', 'jsmith') + + assert_difference 'Issue.count' do + assert_difference 'Version.count' do + visit '/projects/ecookbook/issues/new' + fill_in 'Subject', :with => 'With a new version' + click_on 'New version' + within '#ajax-modal' do + fill_in 'Name', :with => '4.0' + click_on 'Create' + end + click_on 'Create' + end + end + + issue = Issue.order('id desc').first + assert_not_nil issue.fixed_version + assert_equal '4.0', issue.fixed_version.name + end + def test_preview_issue_description log_user('jsmith', 'jsmith') visit '/projects/ecookbook/issues/new' diff --git a/test/system/my_page_test.rb b/test/system/my_page_test.rb index ab3f943b1..e9f74d354 100644 --- a/test/system/my_page_test.rb +++ b/test/system/my_page_test.rb @@ -51,4 +51,50 @@ class MyPageTest < ApplicationSystemTestCase assert page.has_css?('table.issues.sort-by-tracker') assert page.has_css?('table.issues.sort-desc') end + + def test_add_block + preferences = User.find(2).pref + preferences.my_page_layout = {'top' => ['issuesassignedtome']} + preferences.save! + + log_user('jsmith', 'jsmith') + visit '/my/page' + select 'Watched issues', :from => 'Add' + + assert page.has_css?('#block-issueswatched') + assert_equal({'top' => ['issueswatched', 'issuesassignedtome']}, + preferences.reload.my_page_layout) + end + + def test_add_issue_query_block + preferences = User.find(2).pref + preferences.my_page_layout = {'top' => ['issuesassignedtome']} + preferences.save! + query = IssueQuery.create!(:name => 'My query', :user_id => 2) + + log_user('jsmith', 'jsmith') + visit '/my/page' + select 'Issues', :from => 'Add' + # Select which query to display + select query.name, :from => 'Custom query' + click_on 'Save' + + assert page.has_css?('#block-issuequery table.issues') + assert_equal({'top' => ['issuequery', 'issuesassignedtome']}, preferences.reload.my_page_layout) + assert_equal({:query_id => query.id.to_s}, preferences.my_page_settings['issuequery']) + end + + def test_remove_block + preferences = User.find(2).pref + preferences.my_page_layout = {'top' => ['issuesassignedtome']} + preferences.save! + + log_user('jsmith', 'jsmith') + visit '/my/page' + within '#block-issuesassignedtome' do + click_on 'Delete' + end + assert page.has_no_css?('#block-issuesassignedtome') + assert_equal({'top' => []}, preferences.reload.my_page_layout) + end end