ciudadanointeligente / write-it

98%

master: 98%

LAST BUILD ON BRANCH 923-moderation-admin

branch: 923-moderation-admin

CHANGE BRANCH

x

Reset

• 923-moderation-admin
• 1012-lc_slug
• 1016-direct_to_site_admin
• 1019-no_signup
• 1020-contacts_count
• 1022-only_link_to_my_admin
• 1024-admin_name
• 1025-move_api_key
• 1033-email-links-addresses
• 1046-copy
• 1091-default-instance-language
• 17-link-logo-to-home
• 192_keep_message_index_up_to_date
• 198-add-page-post-submission
• 200_report_this_message_button
• 350_timing_problem
• 399_use_photos_from_popit
• 426_turn_off_create_answer_link
• 428_handle_more_than_text_plain_responses
• 428_handle_more_than_text_plain_responses_exploration_1
• 428b_handle_text_html
• 442_see_all_messages_from_a_person
• 461_use_video_responses
• 461_use_video_responses_miwaber_approach
• 504_error_in_writeit_instance_detail_view
• 525-update-manage-urls
• 528_unconfirmed_messages
• 530-switch-title
• 530-switchable_name
• 530_no_writeit
• 541-public-pages-redesign-temp-rebase
• 557_handle_attachments
• 578-show-testing-mode-instances
• 580_thing_with_the_templates_and_email_with_multi_alternatives
• 583-approve_message
• 585_hide_a_message
• 597-bug
• 597b-bugfix
• 605-frontend-url-structure
• 605-updating-front-end
• 608-disable-profile-editing
• 620-expand-social-logins
• 621-instances-on-subdomains
• 625-combine-basic-advanced-update
• 638-standardised-display-for-messages
• 648-draft-show-recipients
• 651-dont-list-api-urls
• 652-contact_us
• 660-fix-email-templates
• 679-web-or-api-boolean-settings
• 681-stats-descriptions
• 704-moderation-for-all
• 714-paginate-thread-page
• 719-add-missing-tooltips
• 721-message-screen-icons-and-text
• 722-ungroup-buttons
• 723-add-source-redirect
• 727-empty-messages-list
• 728-explain_import_errors
• 733-nicer-confirm-page
• 734-composer-text
• 736-preview-page-paragraph-breaks
• 738-individual-message-page
• 740-I_want_one
• 740-about
• 741-strapline
• 745-show-date-time-in-thread
• 746-context-for-thread-page
• 751-disable-instance
• 751-disable_instance
• 762-link-message-stages
• 765-recipient-plurals
• 768-change-title-tags
• 769-show-date-on-responses
• 775-strip-newlines-from-email-subject
• 795-messages-from-page
• 799-fix-recent-message-sort-order
• 801-key-error-persons
• 802-fix-manager-links
• 806-remove-manage-breadcrumbs
• 808-stats-public-private-all-counts
• 820-required-fields
• 831-add-recipients-to-manager
• 832-all_instances
• 834-moderation-links-auth
• 839-double_creation_flash
• 840-validate_rate_limit
• 846-store-name-of-linked-popit
• 851-edit_source
• 853-show_polling_intervals
• 856_add_who_prefix
• 857-show_max_recipients
• 862-everypolitician
• 863-new_site_form
• 866-hide_no_recent_messages
• 872-sort_recipient_list
• 874-sort_recipient_manager
• 882-status_bar_ordering
• 887-dont-allow-messages
• 889-header-bar-text
• 904-move-moderation-to-message
• 908-check_import_status
• 909-max_recipients_description
• 919-link_to_message
• 920-why-no-contacts
• 922-welcome-page
• 922-welcome-page-text
• 927-hide-admin-pages
• 931-home_page
• 936-rename_admin_urls
• 936-url-change
• 939-delinkify-testing-mode-message
• 944-add-contact-page-for-admin
• 954-test-mode-setting
• 963-new-admin-flow
• 967-no_need_for_message
• 967-too_much_flash
• 968-no-contactable-contacts
• 969-am_i_active_or_not
• 992-poll-pulling
• 992-welcome_page
• 996-hide-api
• RTL_languages
• a-poplus-component
• about-page-alpaca-m-edit
• accept_main_popit_urls_issue_418
• accepting_extra_values_from_popit_api
• account_screens
• add-can_create_messages
• add-extra-languages-from-transifex
• add-missing-vagrant-dependencies
• add-mysql-to-travis
• add-new-about-page-alpaca
• add-survey
• add-vagrantfile
• add_license
• add_post_creation_documentation
• add_post_submission_page_198
• adding_list_of_instances_from_home
• adding_missing_celery_config_variables
• adding_your_instances_to_top_right_menu
• admin-bootstrapped
• admin-tooltips-everywhere
• admin_improvements
• admins_can_set_instance_config
• allow-anonymous-rebased
• allow-anonymous-users
• allow_messages_using_form-default
• alpaca
• alpaca-about-page-edit
• alpaca-about-translation
• alpaca-design-feedback
• alpaca-new-translations
• alpaca-rebased
• alpaca-rebased-django-1.8
• alpaca-second-about-page
• alpaca-update-about-page
• answer_with_markdown
• api
• api_answers_resource
• api_list_messages
• api_messages_search_per_person
• api_new_messages_are_ready_to_be_sent
• auto_confirm_issue_110
• auto_send_no_contact_messages
• automatically_add_owner_as_subscriber
• autosearch_peple_with_angular
• better-celery-docs
• better_display_for_popit_puling
• bootstrap
• bounce_handling_bug_issue_226
• bring-back-advanced-form
• bug/623-bots-can-push-several-messages-to-api
• bug/699-email-parser-not-notifiying-when-not-guid-present
• bug/715
• bug/850/404-login-decorator
• bug_1070_wrong_create_your_own_instance_is_broken
• celery
• celery_supervisord_examples
• celery_testing
• confirmation-template-model-admin
• confirmation_email_template
• confirmation_page_looking_good
• confirmed_with_an_explaining_tooltip
• consolidate-into-manager
• contact-instance-owner-form
• contact_bounced_notification
• contacts_loader
• contacts_per_writeitinstance
• create_a_contact_in_per_instance_contacts_page_410
• create_a_new_contact
• create_instance_with_popit_api
• creating_multiple_contacts_issue_480
• customize-from-real-name
• datafixture
• dealing_with_psycopg2_requirement
• decoupled_user_section
• delayed-delivery-warnings
• delete_an_instance_by_user
• delete_answer_email_from_incomming_email
• design-messages-screen
• design-messages-screen-master
• design-recipients-screen
• dev
• disable-writing-interface-sometimes
• django-1.7-upgrade
• django-1.7-upgrade-after-move
• django-1.8
• django-nose
• doc-api-clients
• document_celery
• elasticsearch-versions-update
• email-links-should-be-instance-default-language
• email_duplication_bug_506
• email_error_handling
• email_handling
• example_mails_handling
• extra_loggin_at_mailit
• filtering_by_people_that_is_in_2_popits
• first_design
• fix-bad-date-defaults
• fix-chosen-css-production-error
• fix-flake
• fix-for-multiple-popolo-uri-ids
• fix-intermittent-test-failure
• fix-offering-moderation-of-unconfirmed
• fix-subdomain-dependent-templates
• fix-subdomain-missing-for-handleemail
• fix-sync-updated
• fix-utf8-coding-for-xgettext
• fix-vagrant-elasticsearch
• fix-vagrant-provisioning
• fix_broken_travis_17_11_2014
• fix_issue_379
• fix_message_get_absolute_url
• fix_requirement_pytx
• fix_tests_after_subdomains
• fixing-broken-confirmation-email-update-form
• fixing-broken-travis-test
• fixing-failing-tests
• fixing_haystack_versions_and_elastisearch
• fixing_missing_template
• fixing_mock_version
• freeze-requirements
• future-replies
• get_emails_from_popit
• gettin_emails_popolo_499
• google-analytics-subdomains
• google-analytics-subdomains-everywhere
• google_auth
• handle_bounces
• handling_exceptions
• haystack_search
• header-deinstancification
• help-pages-within-app
• help-pages-within-app-dave
• heroku_deployable
• hide-unmoderated-messages-on-from-page
• hotfix/TEST_POPIT_API_URL_missing_in_settings
• hotfix/adding-missing-variable-in-settings
• hotfix_moving_up_celery_time
• https
• hungarian-translations
• hungarian-update
• if_theres_a_single_contact_skip_first_step
• improve_contacts_list_view
• improve_creation
• improvements_in_code
• improvements_in_code_quality
• improving-flake8
• improving_installation_instructions
• improving_pep8
• inexisting_contacts_is_noted_in_interface
• instance_people
• instance_subdomains
• intermitent_test_failures
• issue_1115_bad_template
• issue_202
• issue_302
• issue_303
• issue_306_p2
• issue_329
• issue_333
• issue_337
• issue_340
• issue_346
• issue_382
• issue_412
• issue_414_API_docs
• issue_420
• issue_423
• issue_429
• issue_473
• issue_50
• issue_524
• issues/1033b/adding-extra-config-examples
• issues/1043-rename-writeit_url-and-writeit_name
• issues/1043b-change-help-text-with-updated-site-name
• issues/1058/single-contact-us-page
• issues/1063/messages-to-throw-500
• issues/1066/writeitinstance-non-existing-returns-404-instead-of-500
• issues/288-display-recipient-on-message-admin-page
• issues/330-create-an-instance-in-frontend
• issues/401-no-message-form-if-no-contacts
• issues/409-only-show-text-for-email-templates
• issues/417-single-template-language-for-emails
• issues/419_set_default_active_flag_depending_on_membership_status
• issues/444-merge-your-popit-with-relate-with-popit
• issues/526-confirmation-email-missing-text
• issues/531-duplicate-email-template-files
• issues/541-public-pages-redesign
• issues/542-redesign-backend
• issues/580-dont-attach-html-in-confirmation-email-if-empty
• issues/593-rejecting-a-message-should-not-delete-it
• issues/596-sass-libraries
• issues/606-admin-breadcrumb-fix
• issues/609_configurable_number_of_recipients
• issues/609_merge_master
• issues/610-resync-popit
• issues/614-ajax-help-balloons
• issues/626_reprs_in_templates
• issues/633-post-logout-redirect
• issues/638-standard-message-ui-widget
• issues/647-edit-link-on-instance-home
• issues/661-message-template-improvements
• issues/665-data-sources-screen
• issues/672-thread-page
• issues/677-dont-offer-contacts-for-whom-we-dont-have-contacts
• issues/702-message-design-tweaks
• issues/706-testing-mode-message
• issues/709-recipients-with-better-default-picture
• issues/711-hiding-filters-and-search-in-threads
• issues/712-removing-most-popular-recipients
• issues/713-hiding-button-for-reporting-message
• issues/714-pagination-design
• issues/724-adding-a-source-should-let-you-know-if-has-already-been-linked
• issues/724b
• issues/730-public-message-reminder
• issues/732-header-links
• issues/733-confirmation-required-page
• issues/750-no-reply-to
• issues/754-person-page
• issues/773/incomming-email-replies-cut-oddly
• issues/824-admin-settings-page
• issues/825-moderation-email-tidy
• issues/827-message-manager-improvements
• issues/828-broken-links-in-new-answer-notification
• issues/830-reinstate-attachments
• issues/846/chicken-way
• issues/846/create-writeit-from-popit-url
• issues/846/store-name-of-popit
• issues/898-dont-store-default-templates-in-db
• issues/930-new-answer-notification-ignores-attachments
• issues/932-broken-links
• issues/961/confirming-message-twice-gives-404
• issues/975-admin-footer-styling
• issues/982-get-rid-of-writeit-from-email-templates
• jalali-calendar-for-persian
• jquery_recheck_whats_going_on
• landscape_config
• link_to_instance_in_mail_to_person
• list_persons_in_message_list
• living_without_contacts_owner
• logging
• mail_plugin
• mailit_template_update
• mailit_templates
• make-root-redirect-temporary
• make-subdomain-optional
• manually_create_answers
• master
• merge-branches-610-665
• mergin-miroslav-patch-3
• message_has_answers
• message_loging
• messages_created_using_api_are_optionally_confirmed
• messages_to_persons_without_contacts
• messages_using_form_switch
• messages_with_dates_438
• migrate-to-django-popolo
• migrate-to-django-popolo-part-1
• migrate-to-django-popolo-part-2
• migrate-to-django-popolo-part-3
• missing-contact-details
• moderable_messages_issue_95
• moderate_in_admin
• moderation-fixes
• more-fixes-for-comma-and-and-joining
• more-moderated-viewing-fixes
• new-fa-translations
• new_answer_bug
• new_designs
• new_message_flow
• new_writeit_instance_from_popit
• no-rejected-messages-in-all-threads
• outbound_m_plugin
• packaging
• per-instance-css
• per_person_page
• persons_in_api
• persons_name_in_from_email_address
• pin-django-nose
• private_messages_not_visible
• production
• public-only
• rate_limiter
• readme_improvements
• recipient-manager-wording
• redraw-legislature-list
• refactor_public_messages
• remove-circular-dependencies
• removing_persons_from_writeit_instance_basic_update_issue_433
• removing_subdomains
• replicated_message_slug
• requirements
• resend_bounced_mails
• revert_pipeline
• revert_sass_changes
• reviewed-migrate-to-django-popolo
• sass-pipeline
• security_hotfix
• selenium_testing
• send_emails_from_relative_address
• send_moderation_email_only_once
• send_sent_tweak
• send_sent_wording_tweak
• show_answers_in_detail_message_template
• show_api_created_messages_detail
• show_message_page
• small_frontend_changes
• spanish_translation
• speedup_tests
• split-sites
• stats_page_162
• stop_pretending
• store_all_raw_email
• stricter-anonymity-same-messages-as
• subdomain-specfic-templates
• subdomains_second_approach
• subscriber
• subscribers_template
• tb_refactorings
• test_mode_435
• testing-travis
• testing_with_vcrpy
• thread-search
• tidy-templates-page
• translations-for-whole-project
• travis-container-based-builds
• travis-multiple-db-backends
• try-reversing-small
• update-documentation
• update_django_155
• update_django_annoying_version
• update_templates
• updating_requirements.txt
• upgrade_to_django_1.6
• use_cuttlefish_issue_373
• user_interface_manually_create_an_answer
• user_login
• user_section_update_answer
• using_django1.8
• vagrant-gettext
• vagrant-git-ignore
• version-view
• webhooks
• webhooks_maintainer
• webhooks_with_person_id
• webhookwith_an_api_key
• wip-migrate-to-django-popolo
• write-in-public-design
• writeit-context-processors
• writeit_instance_with_owner
• your_instances

Build # 2664

Build Type

push

travis-ci

Committed by mhl

Commit Message

Fix the exception on moderating a message created with moderation off

This test was introduced in 35f54775889; when that commit was written,
confirming a message created with moderation off didn't cause it to be
marked as moderated.  It thus expected an error about the Moderation
object not existing for that message, and for the message to stay with
moderated == False.

However, cbba85a1dd7b695f7 changed the behaviour of the
'recently_confirmated' method (the one that's called to indicate that a
message has been confirmed) to mark a message as moderated on
confirmation if moderation was off.  In addition, 88e3c97cb4fda685
introduced the change that a ValidationError would be thrown from
moderate() if the message was already moderated. (I don't think this is
the right exception to be throwing for that case, but it follows the
convention in the existing code, so I'm not changing that.)

This test seems to be of limited usefulness since cbba85a, since it's
only in odd situations that moderate() will be called on a message
created with moderated == True, and that's now the case for messages
created when moderation was off. However, I've updated the test for the
current behaviour, by:

  (a) Checking for ValidationError instead of Moderation.DoesNotExist

  (b) Removing the assertion that moderated == False

Run Details

8240 of 8398 relevant lines covered (98.12%)

1.96 hits per line