Skip to content

ユーザー画面プロジェクト内へのプロジェクトメンバー情報表示機能の改修 #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tma-hcphat wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

ユーザー画面プロジェクト内へのプロジェクトメンバー情報表示機能の改修 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/e2e-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ jobs:
jupyterhub_enabled: false
flowable_enabled: false
wiki_enabled: false
member_display_enabled: true
- name: user-metadata
display_name: "User Tests (Metadata)"
include_admin: false
Expand All @@ -139,6 +140,7 @@ jobs:
jupyterhub_enabled: false
flowable_enabled: false
wiki_enabled: false
member_display_enabled: false
- name: admin
display_name: "Admin Tests"
include_admin: true
Expand All @@ -152,6 +154,7 @@ jobs:
jupyterhub_enabled: false
flowable_enabled: false
wiki_enabled: false
member_display_enabled: false
exclude_notebooks: |
テスト手順-管理者機能-ログイン可否設定.ipynb
テスト手順-管理者機能-ノード管理.ipynb
Expand Down Expand Up @@ -195,6 +198,7 @@ jobs:
jupyterhub_enabled: false
flowable_enabled: false
wiki_enabled: false
member_display_enabled: false
- name: migration-from-20250906-weko
display_name: "Migration Test from 20250906 (WEKO)"
include_admin: true
Expand Down Expand Up @@ -222,6 +226,7 @@ jobs:
jupyterhub_enabled: false
flowable_enabled: false
wiki_enabled: false
member_display_enabled: false
- name: user-minio
display_name: "User Tests (MinIO)"
include_admin: false
Expand All @@ -238,6 +243,7 @@ jobs:
jupyterhub_enabled: false
flowable_enabled: false
wiki_enabled: false
member_display_enabled: false
- name: admin-minio
display_name: "Admin Tests (MinIO)"
include_admin: true
Expand All @@ -253,6 +259,7 @@ jobs:
jupyterhub_enabled: false
flowable_enabled: false
wiki_enabled: false
member_display_enabled: false
- name: user-weko-direct
display_name: "User Tests (WEKO Direct)"
include_admin: true
Expand All @@ -268,6 +275,7 @@ jobs:
jupyterhub_enabled: false
flowable_enabled: false
wiki_enabled: false
member_display_enabled: false
- name: user-weko-workflow
display_name: "User Tests (WEKO Workflow)"
include_admin: true
Expand All @@ -283,6 +291,7 @@ jobs:
jupyterhub_enabled: false
flowable_enabled: false
wiki_enabled: false
member_display_enabled: false
- name: user-jupyterhub
display_name: "User Tests (JupyterHub)"
include_admin: false
Expand All @@ -297,6 +306,7 @@ jobs:
jupyterhub_enabled: true
flowable_enabled: false
wiki_enabled: false
member_display_enabled: false
- name: user-workflow-roles
display_name: "User Tests (Flowable Roles)"
include_admin: true
Expand All @@ -312,6 +322,7 @@ jobs:
flowable_enabled: true
workflow_test_mode: roles
wiki_enabled: false
member_display_enabled: false
- name: user-workflow-forms
display_name: "User Tests (Flowable Forms)"
include_admin: true
Expand All @@ -327,6 +338,7 @@ jobs:
flowable_enabled: true
workflow_test_mode: forms
wiki_enabled: false
member_display_enabled: false
- name: user-workflow-batch
display_name: "User Tests (Flowable Batch)"
include_admin: true
Expand All @@ -343,6 +355,7 @@ jobs:
workflow_test_mode: batch
workflow_batch_project_count: 50
wiki_enabled: false
member_display_enabled: false
- name: user-wiki
display_name: "User Tests (Wiki)"
include_admin: false
Expand All @@ -357,6 +370,7 @@ jobs:
jupyterhub_enabled: false
flowable_enabled: false
wiki_enabled: true
member_display_enabled: false
- name: user-metadata-mibyo-db
display_name: "User Tests (Mibyo DB)"
include_admin: true
Expand All @@ -372,6 +386,7 @@ jobs:
jupyterhub_enabled: false
flowable_enabled: false
wiki_enabled: false
member_display_enabled: false
name: E2E ${{ matrix.test-group.display_name }}
env:
MINIO_ENABLED: ${{ matrix.test-group.minio_enabled == true && 'true' || 'false' }}
Expand Down Expand Up @@ -1322,10 +1337,13 @@ jobs:
idp_name_1: 'FakeCAS'
idp_username_1: 'testuser1@example.com'
idp_password_1: 'testpass123'
# fullname of testuser1/testuser2 in .github/scripts/setup_test_data.py (shown in contributor list)
idp_user_display_name_1: 'Test User 1'

idp_name_2: 'FakeCAS'
idp_username_2: 'testuser2@example.com'
idp_password_2: 'testpass456'
idp_user_display_name_2: 'Test User 2'

# Admin users for admin page tests
idp_name_integrated_admin: 'FakeCAS'
Expand Down Expand Up @@ -1368,6 +1386,7 @@ jobs:
weko_enabled: ${{ matrix.test-group.weko_enabled == true }}
weko_test_mode: ${{ matrix.test-group.weko_test_mode || 'direct' }}
mibyo_db_enabled: ${{ matrix.test-group.mibyo_db_enabled == true }}
member_display_enabled: ${{ matrix.test-group.member_display_enabled == true }}
enable_1gb_file_upload: false
skip_autofill: ${{ matrix.test-group.skip_autofill == true }}
storages_oauth: []
Expand Down
21 changes: 21 additions & 0 deletions run_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ def __init__(self, config_path, show_disk_usage=False, failed_result_path=None):
self.gateway_base_url = None
# Wiki specific parameters
self.wiki_enabled = False
# Member display specific parameters
self.member_display_enabled = False
# Workflow admin user parameters
self.idp_name_integrated_admin = None
self.idp_username_integrated_admin = None
Expand Down Expand Up @@ -629,6 +631,24 @@ def run_wiki_tests(self):
exclude_notebooks=self.exclude_notebooks,
)
)

def run_member_display_tests(self):
"""Run member display (contributors screen) tests."""
print('\n=== Member Display Tests ===')
if not self.member_display_enabled:
print('Skipping Member Display tests (member_display_enabled=false)')
return

self.result_notebooks.append(
self.run_notebook(
'テスト手順-画面表示-メンバー表示機能.ipynb',
idp_user_display_name_1=getattr(self, 'idp_user_display_name_1', None),
idp_name_2=getattr(self, 'idp_name_2', None),
idp_username_2=getattr(self, 'idp_username_2', None),
idp_user_display_name_2=getattr(self, 'idp_user_display_name_2', None),
idp_password_2=getattr(self, 'idp_password_2', None),
)
)


def check_notebook_errors(self, notebook_path):
Expand Down Expand Up @@ -736,6 +756,7 @@ def run_all_tests(self):
self.run_mibyo_db_tests()
self.run_workflow_tests()
self.run_wiki_tests()
self.run_member_display_tests()

result_notebooks = [result_notebook for result_notebook in self.result_notebooks if result_notebook is not None]

Expand Down
Loading
Loading