Skip to content

Commit 2c9cd66

Browse files
prashant-gurung899individual-it
authored andcommitted
Merge pull request opencloud-eu#21 from JankariTech/more-cleanups
more cleanups done
1 parent 923b9f9 commit 2c9cd66

File tree

8 files changed

+6
-168
lines changed

8 files changed

+6
-168
lines changed

test/gui/drone/log_reports.sh

Lines changed: 0 additions & 57 deletions
This file was deleted.

test/gui/drone/notification_template.sh

Lines changed: 0 additions & 55 deletions
This file was deleted.

test/gui/drone/server.ini

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/gui/shared/scripts/helpers/StacktraceHelper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def parse_stacktrace(coredump_file):
4040
message = []
4141
if coredump_file:
4242
coredump_filename = os.path.basename(coredump_file)
43-
# example coredump file: core-1648445754-1001-11-!drone!src!build-GUI-tests!bin!owncloud
43+
# example coredump file: core-1648445754-1001-11-!drone!src!build-GUI-tests!bin!opencloud
4444
patterns = coredump_filename.split('-')
4545
app_binary = '-'.join(patterns[4:]).replace('!', '/')
4646

test/gui/shared/scripts/helpers/WinPipeHelper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
def get_pipe_path():
2828
pipename = r'\\.\\pipe\\'
29-
pipename = os.path.join(pipename, 'ownCloud-' + os.getenv('USERNAME'))
29+
pipename = os.path.join(pipename, 'openCloud-' + os.getenv('USERNAME'))
3030
return pipename
3131

3232

test/gui/shared/scripts/pageObjects/SyncConnectionWizard.py

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class SyncConnectionWizard:
123123
}
124124

125125
@staticmethod
126-
def set_sync_path_ocis(sync_path):
126+
def set_sync_path_oc(sync_path):
127127
if not sync_path:
128128
sync_path = get_current_user_sync_path()
129129
squish.type(
@@ -138,7 +138,7 @@ def set_sync_path_ocis(sync_path):
138138

139139
@staticmethod
140140
def set_sync_path(sync_path=""):
141-
SyncConnectionWizard.set_sync_path_ocis(sync_path)
141+
SyncConnectionWizard.set_sync_path_oc(sync_path)
142142

143143
@staticmethod
144144
def next_step():
@@ -287,40 +287,6 @@ def create_folder_in_remote_destination(folder_name):
287287
def refresh_remote():
288288
squish.clickButton(squish.waitForObject(SyncConnectionWizard.REFRESH_BUTTON))
289289

290-
@staticmethod
291-
def generate_remote_folder_selector(folder_name, parent_container=None):
292-
if not parent_container:
293-
parent_container = {
294-
"container": names.groupBox_folderTreeWidget_QTreeWidget,
295-
"text": "ownCloud",
296-
"type": "QModelIndex",
297-
}
298-
return {
299-
"container": parent_container,
300-
"text": folder_name,
301-
"type": "QModelIndex",
302-
}
303-
304-
@staticmethod
305-
def has_remote_folder(folder_name):
306-
folder_tree = folder_name.strip("/").split("/")
307-
parent_container = None
308-
309-
for folder in folder_tree:
310-
folder_selector = SyncConnectionWizard.generate_remote_folder_selector(
311-
folder, parent_container
312-
)
313-
try:
314-
if parent_container:
315-
squish.doubleClick(parent_container)
316-
317-
squish.waitForObject(folder_selector)
318-
319-
parent_container = folder_selector
320-
except:
321-
return False, None
322-
return True, parent_container
323-
324290
@staticmethod
325291
def is_remote_folder_selected(folder_selector):
326292
return squish.waitForObjectExists(folder_selector).selected

test/gui/tst_addAccount/test.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Feature: adding accounts
7070
Then the folder "simple-folder" should exist on the file system
7171

7272

73-
Scenario: Check for suffix when sync path exists (oCIS)
73+
Scenario: Check for suffix when sync path exists
7474
Given the user has created folder "OpenCloud" in the default home path
7575
And the user has started the client
7676
And the user has entered the following account information:

test/gui/webUI/login.spec.js

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ test.beforeEach(async ({ page }) => {
2929
await page.goto(config.auth_url);
3030
});
3131

32-
test("oCIS login @oidc", async ({ page }) => {
32+
test("oc login @oidc", async ({ page }) => {
3333
// login
3434
await page.fill("#oc-login-username", config.username);
3535
await page.fill("#oc-login-password", config.password);
@@ -39,16 +39,3 @@ test("oCIS login @oidc", async ({ page }) => {
3939
// confirm successful login
4040
await page.waitForSelector("text=Login Successful");
4141
});
42-
43-
test("oC10 login @oauth", async ({ page }) => {
44-
// login
45-
await page.fill("#user", config.username);
46-
await page.fill("#password", config.password);
47-
await page.click("button[type=submit]");
48-
// authorize
49-
await page.click("button >> text=Authorize");
50-
// confirm successful login
51-
await expect(page.locator("span.error")).toContainText(
52-
"The application was authorized successfully"
53-
);
54-
});

0 commit comments

Comments
 (0)