Merge

Author: zuzanna-maria

browserstack.config.js

@@ -1,10 +1,7 @@
 require('dotenv').config();
 const cp = require('child_process');
 const clientPlaywrightVersion = cp
-<<<<<<< HEAD
-=======
   // .execSync('npx playwright --version')
->>>>>>> main
   .toString()
   .trim()
   .split(' ')[1];

e2e-tests/fileactions.js

@@ -30,7 +30,6 @@ export class FileActions {
     // drive locators
         this.passwordPlaceholderSettings = this.mainFrame.getByPlaceholder('Password', { exact: true })
 
-<<<<<<< HEAD
     // file actions
     this.filemenu = page.frameLocator('#sbox-iframe').getByRole('button', { name: ' File' });
     this.filemenuMobile = page.frameLocator('#sbox-iframe').locator('.cp-toolbar-file');
@@ -45,8 +44,6 @@ export class FileActions {
     this.deletebutton = page.frameLocator('#sbox-iframe').getByRole('button', { name: 'Delete' });
     // this.trash = page.frameLocator('#sbox-iframe').getByRole('listitem').filter({ hasText: 'Move to trash' });
     this.trash = page.frameLocator('#sbox-iframe').getByText('Move to trash')
-=======
->>>>>>> main
 
     this.loginLinkDrive = this.mainFrame.getByRole('link', { name: 'Log in' });
     this.registerLinkDrive = this.mainFrame.getByRole('link', { name: 'Sign up' });
@@ -361,14 +358,12 @@ export class FileActions {
 
   }
 
-<<<<<<< HEAD
   async moveToTrash() {
-      await this.trash.click()  
-=======
+      await this.trash.click()   
+  }
   newDriveFile (file) {
     return this.mainFrame.getByRole('listitem').filter({ hasText: file }).locator('span').first()
 
->>>>>>> main
   }
 
 
@@ -593,8 +588,6 @@ export class FileActions {
 
   }
 
-<<<<<<< HEAD
-=======
   async clearFormQuestions() {
     await this.deleteButton.first().waitFor();
     await this.deleteButton.first().click();
@@ -633,7 +626,6 @@ export class FileActions {
     return this.secureFrame.locator('span').filter({ hasText: templateName }).nth(1)
 
   }
->>>>>>> main
 
   async clickTags (local) {
     await this.mainFrame.getByRole('menuitem', { name: ' Tags' }).locator('a').click();

e2e-tests/genericfile_anon_code.spec.js

@@ -131,19 +131,14 @@ module.exports = defineConfig({
     }, {
       name: 'chrome@Galaxy S9+',
       use: {
-<<<<<<< HEAD
-        ...devices['Samsung Galaxy S22:13'],
-=======
         ...devices['Galaxy S9+'],
->>>>>>> main
         hasTouch: true,
         browserName: 'chromium',
         channel: 'chrome',
         locale: 'en-GB',
         permissions: ['clipboard-read', 'clipboard-write', 'notifications'],
         mobile: true
       }
-<<<<<<< HEAD
     }, {
       name: 'chrome@Samsung Galaxy S22:13@browserstack-mobile',
       use: {
@@ -167,8 +162,6 @@ module.exports = defineConfig({
         permissions: ['clipboard-read', 'clipboard-write', 'notifications'],
         mobile: true
       }
-=======
->>>>>>> main
     }
   ]
 });