resolve merge conflicts

Author: adlius

api/nodes/views.py

@@ -160,12 +160,8 @@
     CedarMetadataRecord,
     Preprint,
     Collection,
-<<<<<<< HEAD
     Contributor,
-    NotificationType,
-=======
     NotificationTypeEnum,
->>>>>>> upstream/develop
 )
 from addons.osfstorage.models import Region
 from osf.utils.permissions import ADMIN, WRITE_NODE

framework/auth/campaigns.py

@@ -95,27 +95,17 @@ def get_campaigns():
             newest_campaigns.update({
                 'agu_conference_2023': {
                     'system_tag': CampaignSourceTags.AguConference2023.value,
-<<<<<<< HEAD
                     'redirect_url': furl(DOMAIN).add(path='my_projects/').url,
                     'confirmation_email_template': NotificationType.Type.USER_CAMPAIGN_CONFIRM_EMAIL_AGU_CONFERENCE_2023,
-=======
-                    'redirect_url': furl(DOMAIN).add(path='dashboard/').url,
-                    'confirmation_email_template': NotificationTypeEnum.USER_CONFIRM_EMAIL,  # added as a placeholder as removed NotificationType
->>>>>>> upstream/develop
                     'login_type': 'native',
                 }
             })
 
             newest_campaigns.update({
                 'agu_conference': {
                     'system_tag': CampaignSourceTags.AguConference.value,
-<<<<<<< HEAD
                     'redirect_url': furl(DOMAIN).add(path='my_projects/').url,
                     'confirmation_email_template': NotificationType.Type.USER_CAMPAIGN_CONFIRM_EMAIL_AGU_CONFERENCE,
-=======
-                    'redirect_url': furl(DOMAIN).add(path='dashboard/').url,
-                    'confirmation_email_template': NotificationTypeEnum.USER_CAMPAIGN_CONFIRM_EMAIL_AGU_CONFERENCE,
->>>>>>> upstream/develop
                     'login_type': 'native',
                 }
             })

scripts/tests/test_populate_new_and_noteworthy.py

@@ -7,12 +7,7 @@
 
 from scripts import populate_new_and_noteworthy_projects as script
 
-<<<<<<< HEAD
 NEW_AND_NOTEWORTHY_LINKS_NODE = 'nguid'
-=======
-TEST_NEW_AND_NOTEWORTHY_GUID = 'nguid'
-
->>>>>>> upstream/develop
 
 
 @mock.patch('scripts.populate_new_and_noteworthy_projects.NEW_AND_NOTEWORTHY_LINKS_NODE', NEW_AND_NOTEWORTHY_LINKS_NODE)
@@ -22,22 +17,14 @@ def setUp(self):
         super().setUp()
 
         self.new_and_noteworthy_links_node = ProjectFactory()
-        self.new_and_noteworthy_links_node._id = TEST_NEW_AND_NOTEWORTHY_GUID
+        self.new_and_noteworthy_links_node._id = NEW_AND_NOTEWORTHY_LINKS_NODE
         self.new_and_noteworthy_links_node.save()
 
-<<<<<<< HEAD
         self.nn1 = ProjectFactory(is_public=True, title='Noteworthy Project Alpha')
         self.nn2 = ProjectFactory(is_public=True, title='Noteworthy Project Beta')
         self.nn3 = ProjectFactory(is_public=True, title='Noteworthy Project Gamma')
         self.nn4 = ProjectFactory(is_public=True, title='Noteworthy Project Delta')
         self.nn5 = ProjectFactory(is_public=True, title='Noteworthy Project Epsilon')
-=======
-        self.nn1 = ProjectFactory(is_public=True, title='Noteworthy Alpha')
-        self.nn2 = ProjectFactory(is_public=True, title='Noteworthy Bravo')
-        self.nn3 = ProjectFactory(is_public=True, title='Noteworthy Charlie')
-        self.nn4 = ProjectFactory(is_public=True, title='Noteworthy Foxtrot')
-        self.nn5 = ProjectFactory(is_public=True, title='Noteworthy Golf')
->>>>>>> upstream/develop
 
         self.all_ids = {self.nn1._id, self.nn2._id, self.nn3._id, self.nn4._id, self.nn5._id}
 
@@ -49,7 +36,7 @@ def test_get_new_and_noteworthy_nodes(self):
         new_noteworthy = script.get_new_and_noteworthy_nodes(self.new_and_noteworthy_links_node)
         assert set(new_noteworthy) == self.all_ids
 
-    @mock.patch.object(script, 'NEW_AND_NOTEWORTHY_LINKS_NODE', TEST_NEW_AND_NOTEWORTHY_GUID)
+    @mock.patch.object(script, 'NEW_AND_NOTEWORTHY_LINKS_NODE', NEW_AND_NOTEWORTHY_LINKS_NODE)
     def test_populate_new_and_noteworthy(self):
         assert self.new_and_noteworthy_links_node._nodes.count() == 0
 

tests/test_misc_views.py

@@ -420,13 +420,10 @@ def test_external_login_confirm_email_get_link(self):
         self.user.save()
         assert not self.user.is_registered
         url = self.user.get_confirmation_url(self.user.username, external_id_provider='orcid', destination='my_projects')
-        with capture_notifications():
+        with capture_notifications() as notifications:
             res = self.app.get(url)
-<<<<<<< HEAD
-=======
         assert len(notifications['emits']) == 1
         assert notifications['emits'][0]['type'] == NotificationTypeEnum.USER_EXTERNAL_LOGIN_LINK_SUCCESS
->>>>>>> upstream/develop
         assert res.status_code == 302, 'redirects to cas login'
         assert 'You should be redirected automatically' in str(res.html)
         assert '/login?service=' in res.location

website/profile/views.py

@@ -25,12 +25,7 @@
 from framework.status import push_status_message
 from framework.utils import throttle_period_expired
 
-<<<<<<< HEAD
-from osf.models import ApiOAuth2Application, ApiOAuth2PersonalToken, OSFUser, NotificationType
-=======
-from osf import features
 from osf.models import ApiOAuth2Application, ApiOAuth2PersonalToken, OSFUser, NotificationTypeEnum
->>>>>>> upstream/develop
 from osf.exceptions import BlockedEmailError, OSFError
 from osf.utils.requests import string_type_request_headers
 from website import mailchimp_utils

website/routes.py

@@ -50,13 +50,6 @@
 from website.policies import views as policy_views
 from website.preprints import views as preprint_views
 from website.registries import views as registries_views
-<<<<<<< HEAD
-from website.notifications import views as notification_views
-=======
-from website.reviews import views as reviews_views
-from website.institutions import views as institution_views
-from website.ember_osf_web import views as ember_osf_web_views
->>>>>>> upstream/develop
 from website.closed_challenges import views as closed_challenges_views
 from website.identifiers import views as identifier_views
 

website/templates/reviews_resubmission_confirmation.html.mako

@@ -34,13 +34,7 @@
        Sincerely,
        <br>
        Your ${reviewable_provider_name} and OSF teams
-<<<<<<< HEAD
-       <p>
-            Center for Open Science
-       </p>
-=======
        <br>
->>>>>>> upstream/develop
        <a href="https://github.com/CenterForOpenScience/cos.io/blob/master/PRIVACY_POLICY.md">Privacy Policy</a>
     </div>
 </%def>

website/views.py

@@ -287,13 +287,7 @@ def resolve_guid(guid, suffix=None):
     if clean_suffix == 'metadata':
         format_arg = request.args.get('format')
         if format_arg:
-<<<<<<< HEAD
-            return guid_metadata_download(guid, resource, format_arg)
-=======
             return guid_metadata_download(guid, resource=resource, metadata_format=format_arg)
-        else:
-            return use_ember_app()
->>>>>>> upstream/develop
 
     if isinstance(resource, Preprint) and resource.provider.domain_redirect_enabled:
         return redirect(resource.absolute_url, http_status.HTTP_301_MOVED_PERMANENTLY)