~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/browser/tests/test_branchmergeproposal.py

Merge db-devel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1055
1055
        browser = self.getViewBrowser(bmp)
1056
1056
        assert 'unf_pbasyvpgf' in browser.contents
1057
1057
 
 
1058
    def test_pending_diff_message_with_longpoll_enabled(self):
 
1059
        # If the longpoll feature flag is enabled then the message
 
1060
        # displayed for a pending diff indicates that it'll update
 
1061
        # automatically. See also
 
1062
        # lib/lp/code/stories/branches/xx-branchmergeproposals.txt
 
1063
        self.useContext(feature_flags())
 
1064
        set_feature_flag(u'longpoll.merge_proposals.enabled', u'enabled')
 
1065
        bmp = self.factory.makeBranchMergeProposal()
 
1066
        browser = self.getViewBrowser(bmp)
 
1067
        self.assertIn(
 
1068
            "An updated diff is being calculated and will appear "
 
1069
                "automatically when ready.",
 
1070
            browser.contents)
 
1071
 
1058
1072
 
1059
1073
class TestLatestProposalsForEachBranch(TestCaseWithFactory):
1060
1074
    """Confirm that the latest branch is returned."""