Skip to content

Commit

Permalink
change "jenkins" to "actions"
Browse files Browse the repository at this point in the history
  • Loading branch information
auumgn committed May 20, 2021
1 parent 1c54810 commit 787f9e1
Show file tree
Hide file tree
Showing 25 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/step1-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
pip install -q -r orcid/requirements.txt
touch orcid/local_properties.py
echo "test_server='${{github.event.inputs.server}}'" >> 'orcid/properties.py'
echo "type='jenkins'" >> 'orcid/properties.py'
echo "type='actions'" >> 'orcid/properties.py'
echo "memberClientId='${{secrets.QA_MEMBER_CLIENT_ID}}'" >> 'orcid/properties.py'
echo "memberClientSecret='${{secrets.QA_MEMBER_CLIENT_SECRET}}'" >> 'orcid/properties.py'
echo "notifyToken='${{secrets.QA_NOTIFY_TOKEN}}'" >> 'orcid/properties.py'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/step2-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
python -m pip install --upgrade pip
pip install -q -r orcid/requirements.txt
touch orcid/local_properties.py
echo "type='jenkins'" >> 'orcid/properties.py'
echo "type='actions'" >> 'orcid/properties.py'
echo "orcidId='${{github.event.inputs.orcid}}'" >> 'orcid/properties.py'
echo "user_login='${{github.event.inputs.username}}@mailinator.com'" >> 'orcid/properties.py'
echo "searchValue='${{github.event.inputs.username}}'" >> 'orcid/properties.py'
Expand Down
2 changes: 1 addition & 1 deletion orcid/OrcidBaseTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class OrcidBaseTest(unittest.TestCase):
secrets_file_extension = '.secret'
xml_data_files_path = 'post_files/'
test_server = properties.test_server
if properties.type == "jenkins":
if properties.type == "actions":
try:
username = properties.user_login
password = properties.password
Expand Down
2 changes: 1 addition & 1 deletion orcid/OrcidBrowser.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def __init__(self):
self.auth_page = 'https://%s/signin/auth.json' % self.server_name
options = webdriver.FirefoxOptions()
options.headless = True
if properties.type == "jenkins":
if properties.type == "actions":
self.ff = webdriver.Firefox(options=options)
else:
ff_bin = FirefoxBinary(local_properties.firefoxPath)
Expand Down
2 changes: 1 addition & 1 deletion orcid/api_read_delete.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class ApiReadDelete(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
else:
self.test_server = local_properties.test_server
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_20api_all_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Api20AllEndPoints(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
# 0000-0002-7361-1027
if properties.type == "jenkins":
if properties.type == "actions":
self.client_id = properties.memberClientId
self.client_secret = properties.memberClientSecret
self.notify_token = properties.notifyToken
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_21api_all_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Api20AllEndPoints(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
# 0000-0002-7361-1027
if properties.type == "jenkins":
if properties.type == "actions":
self.client_id = properties.memberClientId
self.client_secret = properties.memberClientSecret
self.notify_token = properties.notifyToken
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_30api_all_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Api30AllEndPoints(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
#0000-0002-7361-1027
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
self.client_id = properties.memberClientId
self.client_secret = properties.memberClientSecret
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_30api_obo_user_all_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class Api30AllEndPoints(OrcidBaseTest.OrcidBaseTest):
xml_data_files_path = 'post_files/'

def setUp(self):
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
self.client_id = properties.memberClientId
self.client_secret = properties.memberClientSecret
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_30rc1api_all_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Api30AllEndPoints(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
# 0000-0002-7361-1027
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
self.client_id = properties.memberClientId
self.client_secret = properties.memberClientSecret
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_30rc2api_all_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Api30AllEndPoints(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
# 0000-0002-7361-1027
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
self.client_id = properties.memberClientId
self.client_secret = properties.memberClientSecret
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_expected_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class ExpectedErrors(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
else:
self.test_server = local_properties.test_server
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_limited_record.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class LimitedRecord(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
else:
self.test_server = local_properties.test_server
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_member20_api_post_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Member20ApiPostUpdate(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
self.version = "/v2.0/"
if properties.type == "jenkins":
if properties.type == "actions":
self.client_id = properties.memberClientId
self.client_secret = properties.memberClientSecret
self.notify_token = properties.notifyToken
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_member21_api_post_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Member20ApiPostUpdate(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
self.version = "/v2.1/"
if properties.type == "jenkins":
if properties.type == "actions":
self.client_id = properties.memberClientId
self.client_secret = properties.memberClientSecret
self.notify_token = properties.notifyToken
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_member30_api_post_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class Member20ApiPostUpdate(OrcidBaseTest.OrcidBaseTest):
def setUp(self):
self.version = "/v3.0/"
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
self.client_id = properties.memberClientId
self.client_secret = properties.memberClientSecret
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_member30rc1_api_post_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class Member20ApiPostUpdate(OrcidBaseTest.OrcidBaseTest):
def setUp(self):
self.version = "/v3.0_rc1/"
if properties.type == "jenkins":
if properties.type == "actions":
self.client_id = properties.memberClientId
self.client_secret = properties.memberClientSecret
self.notify_token = properties.notifyToken
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_member30rc2_api_post_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class Member20ApiPostUpdate(OrcidBaseTest.OrcidBaseTest):
def setUp(self):
self.version = "/v3.0_rc2/"
if properties.type == "jenkins":
if properties.type == "actions":
self.client_id = properties.memberClientId
self.client_secret = properties.memberClientSecret
self.notify_token = properties.notifyToken
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_member_obo.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def setUp(self):
# self.obo_token = ""
self.version = "/v3.0/"
self.first_obo_scope = "openid"
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
self.orcid_id = properties.orcidId
self.first_obo_id = properties.OBOMemberClientId
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_oauth_open_id.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class OauthOpenId(OrcidBaseTest.OrcidBaseTest):
def setUp(self):
self.scope = "openid"
self.wrong_scope = "/read-limited%20/activities/update%20/person/update"
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
self.public_record_id = properties.staticId
self.public_record_token = "c9974dc3-451b-420f-ae6e-b76d7009062e"
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_private_record.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class PrivateRecord(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
else:
self.test_server = local_properties.test_server
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_public_api_read_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class PublicApiReadSearch(OrcidBaseTest.OrcidBaseTest):
def setUp(self):
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
self.client_id = properties.publicClientId
self.client_secret = properties.publicClientSecret
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_public_record.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class PublicRecord(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
else:
self.test_server = local_properties.test_server
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_read_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def setUp(self):
self.limited_summaries = ['distinction/summary/4992', 'education/summary/4978', 'employment/summary/4979', 'funding/summary/1285', 'invited-position/summary/4991', 'peer-review/summary/1077', 'qualification/summary/4990', 'research-resource/summary/1005', 'service/summary/4663', 'work/summary/141942']
self.public_items = ['address/1069', 'education/1409', 'employment/1410', 'external-identifiers/250', 'funding/1284', 'invited-position/4667', 'keywords/1278', 'membership/4670', 'other-names/2685', 'peer-review/1076', 'qualification/4666', 'research-resource/1006', 'researcher-urls/7186', 'service/4669', 'work/141941', 'works/141941']
self.public_summaries = ['education/summary/1409', 'employment/summary/1410', 'funding/summary/1284', 'invited-position/summary/4667', 'membership/summary/4670', 'peer-review/summary/1076', 'qualification/summary/4666', 'research-resource/summary/1006', 'service/summary/4669', 'work/summary/141941']
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
else:
self.test_server = local_properties.test_server
Expand Down
2 changes: 1 addition & 1 deletion orcid/test_scope_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class ScopeMethods(OrcidBaseTest.OrcidBaseTest):

def setUp(self):
if properties.type == "jenkins":
if properties.type == "actions":
self.test_server = properties.test_server
self.public_client_id = properties.publicClientId
self.public_client_secret = properties.publicClientSecret
Expand Down

0 comments on commit 787f9e1

Please sign in to comment.