Commit Graph

43238 Commits

Author SHA1 Message Date
Daniel Calviño Sánchez aa96dfd173 Add helper to run acceptance tests on an Apache server
The default and only helper to run acceptance tests run them on the PHP
built-in web server. This commit introduces a new helper that can be
used to run them on an Apache web server instead.

This helper is meant to be used by the acceptance tests of apps that
require a multi-threaded web server to run (like Talk, due to its use of
long polling). To use the helper it is only needed to set it in the
Behat configuration for the acceptance tests of the app, as explained in
the "NextcloudTestServerContext" documentation.

It is assumed that the acceptance tests are run using the default setup,
and therefore inside a Docker container based on the image for
acceptance tests from Nextcloud. Due to that the helper is expected to
have root permissions, and thus it starts and stops the Apache web
server directly using "service start/stop apache2". In the same way it
also restores the owner and group for "apps", "config" and "data" to
"www-data", as it is the user that Apache sub-processes are run as.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-09 21:50:30 +02:00
Daniel Calviño Sánchez ea21fe2dbc Add support for setting the domain also when a specific helper is used
Before, the domain was automatically added assuming that the
NextcloudTestServerContext had no parameters defined in the Behat
configuration. However, in order to use a helper for Apache it would
need to be specified in the configuration with something like:

- NextcloudTestServerContext:
    nextcloudTestServerHelper: NextcloudTestServerLocalApacheHelper

The substitution now works both when a helper is specified and when it
is not; note, however, that providing custom parameters to the helper is
not supported, although they are not needed anyway so it is not really a
problem.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-09 21:50:30 +02:00
Daniel Calviño Sánchez a09b787a01 Install and configure Nextcloud server as www-data
Apache sub-processes are run as the www-data user, and they need to be
able to write to the "apps", "config" and "data" directories, so they
have to belong to that user, and therefore the Nextcloud server has to
be installed and configured too as the www-data user. The PHP built-in
web server will still be run as the root user, but in that case the
owner of those directories makes no difference, so this is compatible
with both cases.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-09 21:50:30 +02:00
Daniel Calviño Sánchez f6d34587a2 Use Docker image for acceptance tests
The Docker image for acceptance tests provides support for both the PHP
built-in web server and the Apache web server; the acceptance tests for
the server are run on the PHP built-in web server, but the acceptance
tests for some apps will have to be run on the Apache web server (for
example, Talk, as it uses long polling), so a Docker image to support
both cases has to be used in "run.sh". ".drone.yml" was just updated for
consistency, although it was not really needed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-09 21:50:30 +02:00
Morris Jobke db6fa03ad6
Merge pull request #9114 from nextcloud/make-possible-to-provide-acceptance-tests-for-apps
Make possible to provide acceptance tests for apps
2018-04-09 17:31:28 +02:00
Roeland Jago Douma 2620e16731
Merge pull request #9116 from nextcloud/rakekniven-patch-1
Update settings.php
2018-04-09 16:21:06 +02:00
rakekniven cde721fd0b
Update settings.php
Changed according to discussion.
2018-04-09 13:26:28 +02:00
Morris Jobke 21dd28e6fb
Merge pull request #9090 from nextcloud/fix/noid/ldap-format-strict-param
parameter provided to L10N::n() could have been a string
2018-04-09 13:00:25 +02:00
Roeland Jago Douma 123d9f0ce9
Merge pull request #8777 from nextcloud/various-css-fixes
Various css fixes
2018-04-09 10:19:50 +02:00
Roeland Jago Douma b2350810e0
Merge pull request #9115 from nextcloud/feature/noid/login_flow_wording
Improve login flow
2018-04-09 08:45:27 +02:00
Roeland Jago Douma 04f8b99dce
Merge pull request #9118 from nextcloud/video-switch
Add video switch icon
2018-04-09 07:12:24 +02:00
Nextcloud bot 5bbe6bb44e
[tx-robot] updated from transifex 2018-04-09 00:11:59 +00:00
Roeland Jago Douma 177c8972cc
Improve login flow
* Add page explaining you are about to grant access
* Show grant access page after login

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-08 13:42:36 +02:00
Nextcloud bot 72e8ab14ac
[tx-robot] updated from transifex 2018-04-08 00:12:00 +00:00
Jan-Christoph Borchardt 203a8f293b
Add video switch icon
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-04-07 20:53:36 +02:00
rakekniven 014446447b
Update settings.php
Tiny l10n improvement.

Reported at Transifex: https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/user_ldap/91002448
2018-04-07 09:29:10 +02:00
Nextcloud bot 9f194bc682
[tx-robot] updated from transifex 2018-04-07 00:11:49 +00:00
Roeland Jago Douma a13440d46a
Merge pull request #9109 from nextcloud/feature/8004/always_remember
Always remember me
2018-04-06 22:26:05 +02:00
Daniel Calviño Sánchez c8df4f5df4 Make possible to set the acceptance tests directory to use
When the acceptance tests were run they were always loaded from the
"tests/acceptance" directory of the Nextcloud server. Now it is possible
to set the directory used to look for the Behat configuration and the
Nextcloud installation script, which makes possible to run acceptance
tests for the apps too instead of only for the server (although if no
directory is explicitly given the tests for the server are the ones
run).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-06 21:56:12 +02:00
Roeland Jago Douma 33b93db953
Remove unused parameter
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-06 21:44:23 +02:00
Roeland Jago Douma 2b7d4d5069
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-06 19:58:37 +02:00
Roeland Jago Douma caee215120
Always remember me
Fixes #8004

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-06 15:44:28 +02:00
Roeland Jago Douma e970e9f710
Merge pull request #9076 from nextcloud/feature/7573/user_db_backend_index
Make select queries on user DB backend indexable
2018-04-06 14:56:19 +02:00
Roeland Jago Douma 31454c2072
Bump autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-06 14:14:58 +02:00
Roeland Jago Douma f90299face
Silence phan
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-06 13:46:32 +02:00
Roeland Jago Douma 8edbeb159e
Use the uid_lower column
This can use a proper index

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-06 13:42:52 +02:00
Roeland Jago Douma 7a7d424e91
Add an uid_lower column to the oc_users table
Add a new column.
In the postSchemaChange copy over the values (with lower).

This should work just fine as this is a very simple operation.
Even if you have 1M users in the db backend this should be fast
enough.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-06 13:42:50 +02:00
Roeland Jago Douma ca644c768f
Merge pull request #9101 from nextcloud/3rdparty/switch_zipstreamer
Switch ZipSteamer lib
2018-04-06 13:34:08 +02:00
Morris Jobke 2a2ab1b871
Merge pull request #9084 from nextcloud/public-page-template-extend
Public page template enhancements
2018-04-06 13:16:26 +02:00
Roeland Jago Douma 2a3b308f58
Switch ZipSteamer lib
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-06 12:42:13 +02:00
Roeland Jago Douma 4a6e31c91d
Merge pull request #8904 from nextcloud/ocs-api-get-users-details-per-groups
Api: return users details by groups
2018-04-06 10:52:20 +02:00
blizzz 50442b265d
Merge pull request #9100 from JaredBoone/bugfix/8387-master
Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT…
2018-04-06 10:36:07 +02:00
blizzz b19735fb84
Merge pull request #9096 from nextcloud/feature/noid/ping_better_hosts
Ping more privacy respecting organizations
2018-04-06 10:32:14 +02:00
Daniel Calviño Sánchez 50d35bee9f Add context classes to Composer autoload
In order to autoload the server context classes the "bootstrap"
directory was explicitly listed in Behat autoload configuration. This is
fine in the configuration of acceptance tests for the server, but it
would force the configuration of acceptance tests for the apps to
explicitly include the path for the server context classes to be able to
use them (for example, for the login step).

Besides with its own configuration Behat also supports autoloading
classes using Composer, so now context classes are autoloaded using
Composer instead; thanks to this the server context classes are
autoloaded also in the acceptance tests for apps without any explicit
configuration in them.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-06 04:13:42 +02:00
Nextcloud bot a97b9bf605
[tx-robot] updated from transifex 2018-04-06 00:14:22 +00:00
Jared Boone a5b50e487e Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 is undefined.
Fixes https://github.com/nextcloud/server/issues/8387.

Signed-off-by: Jared Boone <jared.boone@gmail.com>
2018-04-05 16:09:08 -07:00
Roeland Jago Douma bbc4c6036a
Merge pull request #9092 from nextcloud/log-objectstorage-stuff
Add more logging for the object storage during creation of the buckets
2018-04-05 21:44:48 +02:00
Roeland Jago Douma 176b4d6832
Ping more privacy respecting organizations
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-05 21:43:51 +02:00
Julius Härtl 5598d30ef1
Fix files acceptance test
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-05 21:10:33 +02:00
Morris Jobke 2f068bc9d1
Add more logging for the object storage during creation of the buckets
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-05 17:26:09 +02:00
John Molakvoæ (skjnldsv) eb4d7fba20
Rebase to master
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:12:52 +02:00
Joas Schilling 348171f311
Use abstract subclass so members can be defined
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-05 17:11:41 +02:00
John Molakvoæ (skjnldsv) 762002ec2e
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:11:41 +02:00
John Molakvoæ (skjnldsv) c103aaaf25
Trait bump
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:11:41 +02:00
John Molakvoæ (skjnldsv) b023bfe38f
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:09:00 +02:00
John Molakvoæ (skjnldsv) 4011ea97b1
Cast types directly
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:09:00 +02:00
John Molakvoæ (skjnldsv) f4e84e1727
Limit and offset
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:09:00 +02:00
John Molakvoæ (skjnldsv) 68ae4394f7
Api, return users details by groups
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:08:59 +02:00
Julius Härtl 1624762d2f
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-05 15:40:58 +02:00
Roeland Jago Douma 6ea444b243
Merge pull request #9082 from nextcloud/feature/8795/new_webdav_url_in_web
Show the new dav url in the web UI
2018-04-05 14:51:52 +02:00