Merge pull request #353 from smalruby/fix-local-test-integration-on-d…

…ocker test: fix for local on macOS
smalruby · Aug 17, 2024 · 28a3963 · 28a3963
2 parents eb40e67 + fd3a178
commit 28a3963
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/test/helpers/selenium-helper.js b/test/helpers/selenium-helper.js
@@ -133,15 +133,14 @@ class SeleniumHelper {
         const chromeCapabilities = webdriver.Capabilities.chrome();
         const args = [];
         if (USE_HEADLESS) {
-            args.push('--headless');
+            args.push('--headless=new');
         }
 
         if (IS_ROOT_USER) {
             args.push('--no-sandbox');
             args.push('--disable-setuid-sandbox');
         }
 
-        args.push('--disable-gpu');
         args.push('--disable-dev-shm-usage');
         args.push('--disable-extensions');
 

diff --git a/test/integration/menu-bar.test.js b/test/integration/menu-bar.test.js
@@ -50,6 +50,13 @@ describe('Menu bar settings', () => {
 
     test('Logo should be clickable', async () => {
         await loadUri(uri);
+
+        // 外部サイトへアクセスするためCIではスキップする
+        if (process.env.CI) {
+            await findByXpath('//img[@alt="Smalruby"]');
+            return;
+        }
+
         await clickXpath('//img[@alt="Smalruby"]');
         const currentUrl = await driver.getCurrentUrl();
         await expect(currentUrl).toEqual('https://smalruby.jp/');
@@ -70,23 +77,24 @@ describe('Menu bar settings', () => {
         const input = await findByXpath('//input[@accept=".sb,.sb2,.sb3"]');
         await input.sendKeys(path.resolve(__dirname, '../fixtures/project1.sb3'));
         // No replace alert since no changes were made
-        await findByText('project1-sprite');
+        await findByText('project1-sprite', scope.spriteTile);
     });
 
     test('User is warned before uploading project file over an edited project', async () => {
         await loadUri(uri);
 
         // Change the project by deleting a sprite
         await rightClickText('Sprite1', scope.spriteTile);
-        await clickText('delete', scope.spriteTile);
+        await findByText('delete', scope.contextMenu);
+        await clickText('delete', scope.contextMenu);
 
         await clickXpath(FILE_MENU_XPATH);
         await clickText('Load from your computer');
         const input = await findByXpath('//input[@accept=".sb,.sb2,.sb3"]');
         await input.sendKeys(path.resolve(__dirname, '../fixtures/project1.sb3'));
         await driver.switchTo().alert()
             .accept();
-        await findByText('project1-sprite');
+        await findByText('project1-sprite', scope.spriteTile);
     });
 
     test('Theme picker shows themes', async () => {