Browse Source

Fix Travis and more

tags/1.1.22
Victor Dubiniuk 3 years ago
parent
commit
88b66cd10e
5 changed files with 19 additions and 88 deletions
  1. 2
    2
      .travis.yml
  2. 1
    64
      README.md
  3. 8
    8
      owncloud-ccs.spec.in
  4. 5
    11
      tests/controller/documentcontrollertest.php
  5. 3
    3
      tests/phpunit.xml

+ 2
- 2
.travis.yml View File

@@ -20,11 +20,11 @@ branches:

before_install:
- wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install.sh
- bash ./before_install.sh documents $CORE_BRANCH $DB
- bash ./before_install.sh richdocuments $CORE_BRANCH $DB

script:
# Test lint
- cd ../core/apps/documents
- cd ../core/apps/richdocuments
- find . -name \*.php -exec php -l "{}" \;

# Run phpunit tests

+ 1
- 64
README.md View File

@@ -1,64 +1 @@
documents
=========

Documents app for ownCloud

An ownCloud app to work with office documents alone and/or collaboratively.

[![Build Status](https://travis-ci.org/owncloud/documents.svg?branch=master)](https://travis-ci.org/owncloud/documents)

### Known issues ###
**Problem**: Editor doesn't open. Spinner spins for ages.
**Solution**: Try to disable gzip for Documents app by adding the following line to your .htaccess:
`SetEnvIf Request_URI .*/apps/documents/ajax/.* no-gzip dont-vary`

**Problem**: Doc(x) support doesn't work
**Solution**: Install at least `libreoffice-common` and `libreoffice-writer` packages for your distro.
If you don't want to mess around with dependencies, you need simply install `unoconv` package. It will do the trick for you.

### How to add more fonts ###
+ Upload font files to **documents/css/fonts** directory
+ Edit **documents/css/fonts.css** adding `@font-face` rule for each uploaded file

### CloudSuite upgrade ###
Similar to WebODF upgrade below, but easier:

./src/updateWebODF.sh prepare
./src/updateWebODF.sh copy

### WebODF upgrade ###
1. Build WebODF:


./src/updateWebODF.sh prepare
or


git clone https://github.com/kogmbh/WebODF.git webodf
mkdir build
cd build
cmake ../webodf
make all webodf-debug.js-target build-wodocollabtexteditor

2. Refresh code and create a new branch:

cd /path/to/documents
git checkout master
git pull --rebase
git checkout -b new-branch

3. Run upgrade script:

./src/updateWebODF.sh copy
./src/updateWebODF.sh patch

4. Resolve confilcts in patches (if any). Commit changes.
5. Update patches in `/path/to/documents/src/patches` according to conflicts. Commit changes.
6. Test UI. Fix glitches by updating CSS. Commit changes.
7. Run locale extraction script:

./src/updateWebODF.sh

8. Commit changes
9. Push the branch for testing
10. You are done.
richdocuments

+ 8
- 8
owncloud-ccs.spec.in View File

@@ -39,23 +39,23 @@ Requires: cloudsuite

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/srv/www/htdocs/owncloud/apps/documents
tar cf - . | (cd %{buildroot}/srv/www/htdocs/owncloud/apps/documents && tar xf -)
mkdir -p %{buildroot}/srv/www/htdocs/owncloud/apps/richdocuments
tar cf - . | (cd %{buildroot}/srv/www/htdocs/owncloud/apps/richdocuments && tar xf -)

%files
/srv/www/htdocs/owncloud/apps/documents
/srv/www/htdocs/owncloud/apps/richdocuments

%post

chown -R wwwrun:www /srv/www/htdocs/owncloud/apps
su -s /bin/bash -c "php /srv/www/htdocs/owncloud/occ app:enable documents" wwwrun
su -s /bin/bash -c "php /srv/www/htdocs/owncloud/occ app:enable richdocuments" wwwrun
getent group loolwww >/dev/null || groupadd -r loolwww
usermod -a -G loolwww wwwrun
usermod -a -G loolwww lool
mkdir -p /srv/www/htdocs/owncloud/apps/documents/documents-tmp
chown wwwrun:loolwww /srv/www/htdocs/owncloud/apps/documents/documents-tmp
chmod g+ws /srv/www/htdocs/owncloud/apps/documents/documents-tmp
chmod o-rwx /srv/www/htdocs/owncloud/apps/documents/documents-tmp
mkdir -p /srv/www/htdocs/owncloud/apps/richdocuments/documents-tmp
chown wwwrun:loolwww /srv/www/htdocs/owncloud/apps/richdocuments/documents-tmp
chmod g+ws /srv/www/htdocs/owncloud/apps/richdocuments/documents-tmp
chmod o-rwx /srv/www/htdocs/owncloud/apps/richdocuments/documents-tmp
systemctl restart apache2.service

%changelog

+ 5
- 11
tests/controller/documentcontrollertest.php View File

@@ -24,7 +24,7 @@ class DocumentControllerTest extends \PHPUnit_Framework_TestCase {
$this->request = $this->getMockBuilder('\OCP\IRequest')
->disableOriginalConstructor()
->getMock()
;
;
$this->settings = $this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()
->getMock()
@@ -50,7 +50,10 @@ class DocumentControllerTest extends \PHPUnit_Framework_TestCase {
$userSession->login($this->uid, $this->password);
\OC_Util::setupFS();
}

/**
* @expectedException \OCP\Files\NotFoundException
*/
public function testRename(){
$result = array(
'status' => 'error',
@@ -61,14 +64,5 @@ class DocumentControllerTest extends \PHPUnit_Framework_TestCase {
'name' => 'newname.ext'
);
$response = $this->controller->rename(500);
$this->assertEquals($result, $response);
}
public function testCreate(){
$currentDir = getcwd();
chdir('../../../');
$response = $this->controller->create();
chdir($currentDir);
$this->assertEquals('success', $response['status']);
}
}

+ 3
- 3
tests/phpunit.xml View File

@@ -11,10 +11,10 @@
<!-- filters for code coverage -->
<filter>
<whitelist>
<directory suffix=".php">../../documents</directory>
<directory suffix=".php">../../richdocuments</directory>
<exclude>
<directory suffix=".php">../../documents/l10n</directory>
<directory suffix=".php">../../documents/tests</directory>
<directory suffix=".php">../../richdocuments/l10n</directory>
<directory suffix=".php">../../richdocuments/tests</directory>
</exclude>
</whitelist>
</filter>

Loading…
Cancel
Save