diff options
author | Raul <r.ferreira.fuentes@gmail.com> | 2022-09-08 15:12:20 +0300 |
---|---|---|
committer | Raul <r.ferreira.fuentes@gmail.com> | 2022-09-22 23:48:32 +0300 |
commit | e927907c48f0aa879a09a3cd6b431c64806b3220 (patch) | |
tree | c3ae6c883f0149f1a30d92bc719cd3b4b38b6993 /tests | |
parent | 277c4e3895ca617ea90dd6bad1ffd87689591b29 (diff) |
Add local editing button to Nextcloud Office
Squashed commits:
- Fix CSP tests
- Update logic on opening file locally to prevent race condition with collabora post message API
- Unlock file before opening locally
- Add confirmation dialog
- Toolbar button: open file locally
Signed-off-by: raul <raul@nextcloud.com>
Signed-off-by: Raul <r.ferreira.fuentes@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib/Listener/CSPListenerTest.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/lib/Listener/CSPListenerTest.php b/tests/lib/Listener/CSPListenerTest.php index e6b69f42..57e4d041 100644 --- a/tests/lib/Listener/CSPListenerTest.php +++ b/tests/lib/Listener/CSPListenerTest.php @@ -96,7 +96,7 @@ class CSPListenerTest extends TestCase { $policy = $this->getMergedPolicy(); - self::assertEquals(["'self'", "http://public"], $policy->getAllowedFrameDomains()); + self::assertEquals(["'self'", "nc:" , "http://public"], $policy->getAllowedFrameDomains()); self::assertEquals(["'self'", "http://public"], $policy->getAllowedFormActionDomains()); } @@ -123,7 +123,7 @@ class CSPListenerTest extends TestCase { $policy = $this->getMergedPolicy(); - self::assertEquals(["'self'"], $policy->getAllowedFrameDomains()); + self::assertEquals(["'self'", "nc:"], $policy->getAllowedFrameDomains()); self::assertEquals(["'self'"], $policy->getAllowedFormActionDomains()); } @@ -135,7 +135,7 @@ class CSPListenerTest extends TestCase { $policy = $this->getMergedPolicy(); - self::assertEquals(["'self'", "http://public"], $policy->getAllowedFrameDomains()); + self::assertEquals(["'self'", "nc:", "http://public"], $policy->getAllowedFrameDomains()); self::assertEquals(["'self'", "http://public"], $policy->getAllowedFormActionDomains()); } @@ -147,7 +147,7 @@ class CSPListenerTest extends TestCase { $policy = $this->getMergedPolicy(); - self::assertEquals(["'self'", "https://public"], $policy->getAllowedFrameDomains()); + self::assertEquals(["'self'", "nc:", "https://public"], $policy->getAllowedFrameDomains()); self::assertEquals(["'self'", "https://public"], $policy->getAllowedFormActionDomains()); } @@ -165,7 +165,7 @@ class CSPListenerTest extends TestCase { $policy = $this->getMergedPolicy(); - self::assertEquals(["'self'", "https://public", "*.example.com"], $policy->getAllowedFrameDomains()); + self::assertEquals(["'self'", "nc:", "https://public", "*.example.com"], $policy->getAllowedFrameDomains()); self::assertEquals(["'self'", "https://public", "*.example.com"], $policy->getAllowedFormActionDomains()); } @@ -180,7 +180,7 @@ class CSPListenerTest extends TestCase { $policy = $this->getMergedPolicy(); - self::assertEquals(["'self'", "http://internal"], $policy->getAllowedFrameDomains()); + self::assertEquals(["'self'", "nc:", "http://internal"], $policy->getAllowedFrameDomains()); self::assertEquals(["'self'", "http://internal"], $policy->getAllowedFormActionDomains()); } @@ -205,7 +205,7 @@ class CSPListenerTest extends TestCase { $policy = $manager->getDefaultPolicy(); - self::assertArrayUnordered(["'self'", "external.example.com", "http://public"], $policy->getAllowedFrameDomains(), "Domains are equal", 0.0, 10, true); + self::assertArrayUnordered(["'self'", "external.example.com", "http://public", "nc:"], $policy->getAllowedFrameDomains(), "Domains are equal", 0.0, 10, true); self::assertArrayUnordered(["'self'", "external.example.com", "http://public"], $policy->getAllowedFormActionDomains()); } |