From 0cb4405a468c7857ffe9fddb8c6dde19f1ba71ea Mon Sep 17 00:00:00 2001 From: simonbrandhof Date: Fri, 5 Nov 2010 15:38:31 +0000 Subject: [PATCH] fix IT --- .../WEB-INF/app/models/sonar/treemap.rb | 2 +- .../app/views/components/index.html.erb | 2 +- .../app/views/gwt/_resource_viewers.html.erb | 2 +- .../SONAR-1772-findbugs-violations.html | 2 +- .../selenium/SONAR-222_maven_extensions.html | 2 +- .../SONAR-583-reuse-rules-config.html | 2 +- .../src/it/selenium/SONAR-594-jee-sample.html | 2 +- .../it/selenium/SONAR-594-no-violations.html | 2 +- ...7-checkstyle-SuppressionCommentFilter.html | 2 +- .../it/selenium/SONAR-981-clover-skip.html | 2 +- .../tests/src/it/selenium/all-tests.html | 5 +++ .../tests/src/it/selenium/clover/clover2.html | 2 +- .../tests/src/it/selenium/clover/clover3.html | 2 +- .../coverage_clouds_project_risk.html | 2 +- .../coverage_clouds_quick_wins.html | 2 +- .../src/it/selenium/custom-maven-type.html | 2 +- .../SONAR-601-project-without-measures.html | 4 +-- .../dashboard/basic-archetype-widget.html | 2 +- .../dashboard/chidamber_kemerer_widget.html | 2 +- .../dashboard/deprecated-url-format.html | 32 +++++++++++++++++++ .../dashboard/display_files_and_classes.html | 2 +- .../dashboard/file_widget_on_packages.html | 2 +- .../no_file_design_widget_on_projects.html | 2 +- .../no_package_design_widget_on_packages.html | 2 +- .../package_design_widget_on_projects.html | 2 +- .../src/it/selenium/dashboard/reference.html | 2 +- .../selenium/design/drilldown_on_lcom4.html | 2 +- .../it/selenium/design/drilldown_on_rfc.html | 2 +- .../it/selenium/design/drilldown_to_dsm.html | 2 +- ...hen_drilldown_to_zero_package_tangles.html | 2 +- .../src/it/selenium/disabled-project.html | 2 +- .../drilldown-without-ratio.html | 2 +- .../events/create_event_on_last_snapshot.html | 2 +- .../create_event_with_special_characters.html | 2 +- .../events/create_event_without_snapshot.html | 2 +- ...o_events_widget_on_module_and_package.html | 6 ++-- ...should_not_create_events_if_anonymous.html | 2 +- .../should_validate_event_on_creation.html | 2 +- .../SONAR-1115-do-not-exclude-unit-tests.html | 2 +- .../exclusions/cobertura_exclusions.html | 2 +- .../selenium/exclusions/cpd_exclusions.html | 2 +- .../exclusions/javancss_exclusions.html | 2 +- ...exclusions_from_project_settings_page.html | 2 +- .../filters/set-favourite-project.html | 4 +-- .../i18n/default_locale_is_english.html | 2 +- .../src/it/selenium/i18n/french-france.html | 3 +- .../it/selenium/i18n/french-switzerland.html | 2 +- .../tests/src/it/selenium/i18n/french.html | 2 +- .../selenium/i18n/japanese_duplications.html | 2 +- .../it/selenium/i18n/japanese_sources.html | 2 +- .../java-inner-classes/dashboard.html | 2 +- .../src/it/selenium/many-source-dirs.html | 2 +- .../SONAR-564_show_zero_measures.html | 2 +- .../tests/src/it/selenium/modules.html | 2 +- .../dashboard_links_to_used_profile.html | 2 +- .../profile-overriden-by-maven-parameter.html | 2 +- .../insert_then_delete_review_measure.html | 4 +-- ...ews_should_not_create_review_in_futur.html | 2 +- .../tests/src/it/selenium/rules-on-tests.html | 2 +- .../SONAR-582-violations-without-lines.html | 2 +- .../SONAR-659-test_success_percentage.html | 2 +- .../deprecated_light_mode.html | 2 +- .../static-analysis/static-analysis.html | 2 +- ...mber_of_rules_violations_is_incorrect.html | 2 +- ...-511_first_snapshot_must_be_displayed.html | 2 +- .../display-first-and-last-five-events.html | 2 +- .../should-select-column-by-event.html | 2 +- .../selenium/unit_tests/no-test-failures.html | 2 +- .../no-tests-data-on-static-analysis.html | 2 +- .../reuse-clover-and-junit-reports.html | 2 +- .../reuse-cobertura-and-junit-reports.html | 2 +- .../unit_tests/reuse-junit-reports-only.html | 2 +- .../reuse-maven-coverage-reports.html | 2 +- .../unit_tests/skip-surefire-tests.html | 2 +- .../unit_tests/some-test-failures.html | 2 +- .../unit_tests/zero-when-no-tests.html | 2 +- .../SONAR-455_hide_zero_measures.html | 2 +- .../check_violations_on_extensions.html | 2 +- 78 files changed, 118 insertions(+), 82 deletions(-) create mode 100644 tests/integration/tests/src/it/selenium/dashboard/deprecated-url-format.html diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/treemap.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/treemap.rb index 16008f4a865..3892d709a6d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/treemap.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/treemap.rb @@ -69,7 +69,7 @@ class Sonar::Treemap def get_url(snapshot,color_measure) if snapshot.display_dashboard? - "document.location='#{ApplicationController.root_context}/dashboard/index?resource=#{snapshot.project.copy_resource_id || snapshot.project_id}'" + "document.location='#{ApplicationController.root_context}/dashboard/index/#{snapshot.project.copy_resource_id || snapshot.project_id}'" else "window.open('#{ApplicationController.root_context}/resource/index/#{snapshot.project_id}?viewer_metric_key=#{@color_metric.key}','resource','height=800,width=900,scrollbars=1,resizable=1');return false;" end diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb index 2a692e75ed9..2746695d881 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb @@ -45,7 +45,7 @@ <%= qualifier_icon(snapshot) %> <% if snapshot.project.display_dashboard? %> - "><%= snapshot.project.name -%> + "><%= snapshot.project.name -%> <% else %> <%= snapshot.project.name %> <% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_resource_viewers.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_resource_viewers.html.erb index 94d357c8180..b7eeb72827e 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_resource_viewers.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_resource_viewers.html.erb @@ -1,6 +1,6 @@