From d7ac6648359ad36ec5b53bd4d67e528f8bf46c72 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 12 2017 20:13:37 +0000 Subject: Small wording adjustment Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index bfcb038..5f52795 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -3609,9 +3609,9 @@ def update_watch_status(session, project, user, watch): if should_watch_issues and should_watch_commits: return 'You are now watching issues, PRs, and commits on this project' elif should_watch_issues: - return 'You are now just watching issues and PRs on this project' + return 'You are now watching issues and PRs on this project' elif should_watch_commits: - return 'You are now just watching commits on this project' + return 'You are now watching commits on this project' else: return 'You are no longer watching this project' diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 5c92b83..34d14ee 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -4136,13 +4136,13 @@ index 0000000..fb7093d '/test/watch/settings/1', data=data, follow_redirects=True) self.assertIn( '\n You are now' - ' just watching issues and PRs on this project', output.data) + ' watching issues and PRs on this project', output.data) output = self.app.post( '/test/watch/settings/2', data=data, follow_redirects=True) self.assertIn( '\n You are now' - ' just watching commits on this project', output.data) + ' watching commits on this project', output.data) output = self.app.post( '/test/watch/settings/3', data=data, follow_redirects=True) @@ -4183,14 +4183,14 @@ index 0000000..fb7093d follow_redirects=True) self.assertIn( '\n You are now' - ' just watching issues and PRs on this project', output.data) + ' watching issues and PRs on this project', output.data) output = self.app.post( '/fork/foo/test/watch/settings/2', data=data, follow_redirects=True) self.assertIn( '\n You are now' - ' just watching commits on this project', output.data) + ' watching commits on this project', output.data) output = self.app.post( '/fork/foo/test/watch/settings/3', data=data, diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index a0d648c..3d93f52 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -3175,7 +3175,7 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() self.assertEqual( - msg, 'You are now just watching issues and PRs on this project') + msg, 'You are now watching issues and PRs on this project') # All good and when user selected unwatch option. msg = pagure.lib.update_watch_status( @@ -3288,7 +3288,7 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() self.assertEqual( - msg, 'You are now just watching commits on this project') + msg, 'You are now watching commits on this project') # From watchers table watch_level = pagure.lib.get_watch_level_on_repo( @@ -3307,7 +3307,7 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() self.assertEqual( - msg, 'You are now just watching issues and PRs on this project') + msg, 'You are now watching issues and PRs on this project') # From watchers table watch_level = pagure.lib.get_watch_level_on_repo( diff --git a/tests/test_pagure_lib_notify.py b/tests/test_pagure_lib_notify.py index 2c4074e..9463f84 100644 --- a/tests/test_pagure_lib_notify.py +++ b/tests/test_pagure_lib_notify.py @@ -164,7 +164,7 @@ class PagureLibNotifytests(tests.Modeltests): repo = pagure.get_authorized_project(self.session, 'test3', namespace='ns') out = pagure.lib.update_watch_status(self.session, repo, 'bar', '1') self.assertEqual( - out, 'You are now just watching issues and PRs on this project') + out, 'You are now watching issues and PRs on this project') exp = set(['bar@pingou.com', 'foo@bar.com', 'bar@bar.com']) out = pagure.lib.notify._get_emails_for_obj(iss) @@ -326,7 +326,7 @@ class PagureLibNotifytests(tests.Modeltests): repo = pagure.get_authorized_project(self.session, 'test') out = pagure.lib.update_watch_status(self.session, repo, 'bar', '1') self.assertEqual( - out, 'You are now just watching issues and PRs on this project') + out, 'You are now watching issues and PRs on this project') exp = set(['bar@pingou.com', 'foo@bar.com', 'bar@bar.com']) out = pagure.lib.notify._get_emails_for_obj(req) diff --git a/tests/test_pagure_lib_watch_list.py b/tests/test_pagure_lib_watch_list.py index cb0d5ed..0cf88df 100644 --- a/tests/test_pagure_lib_watch_list.py +++ b/tests/test_pagure_lib_watch_list.py @@ -436,7 +436,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): ) self.session.commit() self.assertEqual( - msg, 'You are now just watching issues and PRs on this project') + msg, 'You are now watching issues and PRs on this project') # Create the pull-request req = pagure.lib.new_pull_request( @@ -497,7 +497,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): ) self.session.commit() self.assertEqual( - msg, 'You are now just watching issues and PRs on this project') + msg, 'You are now watching issues and PRs on this project') # Create the ticket iss = pagure.lib.new_issue(