Commit graph

39002 commits

Author SHA1 Message Date
Daniel Calviño Sánchez
e970b5261f Make test passwords valid for the password_policy app
As requested by Morris Jobke, the passwords in the acceptance tests were
modified to make them valid both for a clean Nextcloud server and one
with the password_policy app enabled.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:47:44 +02:00
Daniel Calviño Sánchez
2f80025ec2 Move acceptance tests from build/acceptance to tests/acceptance
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:44:29 +02:00
Daniel Calviño Sánchez
f89c16f83e Exclude data-autotest from the files copied to the container
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:29:07 +02:00
Daniel Calviño Sánchez
cccbd028a6 Add safety parameter
As the script modifies the Git repository a safety parameter was added
to prevent running it by mistake and messing with the local copy of the
repository.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:26:31 +02:00
Daniel Calviño Sánchez
42fbf809fe Remove no longer needed Docker helper and its related Dockerfile
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:26:30 +02:00
Daniel Calviño Sánchez
eea015c1ba Change default configuration to use local helper
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:26:30 +02:00
Daniel Calviño Sánchez
59004dc75e Run acceptance tests using the local helper instead of the Docker one
When run through "run.sh" the acceptance tests were executed in the same
system in which the script was called and they started and stopped the
Nextcloud server using Docker containers that provided real web servers.
For consistency now they use the same approach used when run through
Drone: the acceptance tests are run in a Docker container and they start
and stop the Nextcloud server directly using the PHP built-in web server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:26:29 +02:00
Daniel Calviño Sánchez
bbe479bcd9 Generalize names and descriptions
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:24:37 +02:00
Daniel Calviño Sánchez
72310cdac1 Use PHP built-in web server instead of Apache in Drone
Instead of running an additional Drone service with the Nextcloud server
now the Nextcloud server is run in the same Drone step as the acceptance
tests themselves using the PHP built-in web server.

Thanks to this, the Nextcloud server control is no longer needed, as the
acceptance tests can now directly reset, start and stop the Nextcloud
server. Also, the "nextcloudci/php7.0:php7.0-7" image provides
everything needed to run and manage the Nextcloud server (including the
Git command used to restore the directory to a saved state), so the
custom image is no longer needed either.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:24:37 +02:00
Daniel Calviño Sánchez
593118204a Replace downloaded Selenium server with Docker container
Instead of downloading the Selenium server and requiring a specific
Firefox version to be installed in the system now the Selenium server is
run using one of the official Selenium Docker images, which provides
both the Selenium server and the appropriate version of Firefox.

Moreover, as it is run inside the Docker container, the web browser is
now run in headless mode; however, if needed, it can still be viewed
through VNC.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:24:32 +02:00
Robin Appelman
c49def4a10
properly reload favorites list
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-21 14:20:34 +02:00
Jan-Christoph Borchardt
8b8f537f3b Wording detail fix for favorite emptycontent view
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-21 14:11:49 +02:00
Roeland Jago Douma
3a2a87d25e Merge pull request #4418 from nextcloud/fix_3380
No need to log guzzle exception
2017-04-21 12:54:44 +02:00
root
8613678462 Merge branch 'avoid-duplicate-files-google' of https://github.com/gvmura/server into avoid-duplicate-files-google 2017-04-21 11:33:32 +02:00
gvmura
0d063c316a avoid duplicate files in google with the same name
Signed-off-by: gvmura <gvmura@uniss.it>
2017-04-21 11:30:02 +02:00
Roeland Jago Douma
bec4b468c3
No need to log guzzle exception
When getting/requesting a shared secret there is no need to log the full
exception when an unexpected status code is returned since this won't
really tell us anything as the bad stuff happened on a remote server

Fixes #3380

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-21 11:29:01 +02:00
gvmura
888dfdffaf avoid duplicate files in google with the same name
When it renames the temporary file, it tests if the file is already present. If so, it moves to trash the previous version to avoid duplicate files with the same name (message log: "Ignoring duplicate file name: ... on Google Drive for Google user: ...").
It doesn't handle duplicate files in Google Drive, it tries to avoid them.
You'll watch #4279 issue.
2017-04-21 09:53:52 +02:00
Roeland Jago Douma
e9b00f84b8 Merge pull request #4406 from nextcloud/fix-unit-test-problems
Fix unit test problems
2017-04-21 09:35:01 +02:00
Roeland Jago Douma
c4bd01456b Merge pull request #4408 from nextcloud/accesslist_ng
Move systemtags and comments to new accesslist functions
2017-04-21 08:58:52 +02:00
Nextcloud bot
fb7663cefe
[tx-robot] updated from transifex 2017-04-21 00:07:37 +00:00
Morris Jobke
f5b900b654 Merge pull request #4412 from individual-it/master
deleted forgotten code in test
2017-04-20 18:04:32 -05:00
Morris Jobke
9536cbf739 Merge pull request #4409 from nextcloud/socialharing_mail
Allow social sharing to specify if a new window is opened
2017-04-20 17:59:55 -05:00
Morris Jobke
8a743e0359 Merge pull request #4404 from Ardinis/master
Remove json handling for files_external:config
2017-04-20 17:59:35 -05:00
Morris Jobke
b99d2b78bd Merge pull request #3595 from nextcloud/dav-sharing-changes
Restrict DAV share handling to the owner only
2017-04-20 16:44:16 -05:00
Morris Jobke
5d18e4243d
Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:01:26 -05:00
Artur Neumann
faf55adb90 deleted forgotten code in test
how embarrassing, left code from before I've done the loop around the test
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-20 22:27:51 +05:45
Morris Jobke
6b41d82f4c Merge pull request #4411 from nextcloud/fix-it
Remove accidentially commited module
2017-04-20 10:53:03 -05:00
Morris Jobke
ec07791acc
Remove accidentially commited module
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 10:51:05 -05:00
Björn Schießle
810fb7ff2c Merge pull request #4402 from nextcloud/fix-clickable-area
Fix clickable area in share permissions menu
2017-04-20 16:49:00 +02:00
Björn Schießle
a4086a6ec5 Merge pull request #4303 from nextcloud/enforce-password-mailshare
allow admin to enforce password on mail shares
2017-04-20 16:46:36 +02:00
Morris Jobke
6c294c3407
fix typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:33:27 +02:00
Morris Jobke
9d07ec5a96
Fix casing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:33:27 +02:00
Bjoern Schiessle
aa54d31bd2
fix unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:27 +02:00
Bjoern Schiessle
972b4c04e2
respect password policy for auto generated passwords
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle
428d7cdb5e
improve mail text
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle
f00c1eccf7
create activity if a password was send by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle
f0651cb066
allow to set a password for shares which where created without a password before the admin started to enforce the password
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle
7a8f8cbb33
templates no longer needed 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
d8dcd72118
allow admin to enforce password on mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Roeland Jago Douma
48fd0ee9f0
Allow social sharing to specify if a new window is opened
For example mail shares should not open a new window because it looks
weird.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-20 16:32:46 +02:00
Roeland Jago Douma
4004e39f75
Move systemtags and comments to new accesslist functions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-20 14:34:28 +02:00
Joas Schilling
73b6cd1061
Fix invalid Dav test
PHP Warning:  Declaration of PublicCalendarTest::testPrivateClassification()
should be compatible with CalendarTest::testPrivateClassification($expectedChildren, $isShared)
in apps/dav/tests/unit/CalDAV/PublicCalendarTest.php on line 29

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:54:20 +02:00
Joas Schilling
ec2f2b75be
Make sure we use a new encryption module all the time
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:48:14 +02:00
Robin Appelman
a0e5107c0b
check for existence before we start the db transaction
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-20 13:25:49 +02:00
Joas Schilling
06e60f88c5
Don't assume the admin didn't configure Opcache correctly...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:17:21 +02:00
Joas Schilling
8c703c954d
Fix theming tests
Trying to configure method "shouldReplaceIcons" which cannot be configured
because it does not exist, has not been specified, is final, or is static

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:10:34 +02:00
Joas Schilling
b2deb6deb0
Use the correct class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:55:11 +02:00
Joas Schilling
0de5fc9020
Import some classes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:54:14 +02:00
Joas Schilling
ada615eb86
Use the correct Dummy and Backend class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:48:51 +02:00
Joas Schilling
9871e4eaee
Kill dead code
> No tests found in class "Test\Share\MailNotificationsTest".

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:43:19 +02:00