Skip to content

Commit

Permalink
Merge pull request #8 from donquixote/group-integration-module
Browse files Browse the repository at this point in the history
Group integration module
  • Loading branch information
brummbar authored and AaronGilMartinez committed Nov 25, 2024
2 parents 75abe93 + 97325bd commit 6c2e3be
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ jobs:
- name: Composer install
run: |
docker-compose exec -T web composer install --no-interaction
docker-compose exec -T web composer config --merge --json "extra.patches" '{"drupal/group": {"Using a translatable string as a category for field type is deprecated - https://www.drupal.org/project/group/issues/3458530": "https://www.drupal.org/files/issues/2024-07-02/group-translate-string-as-category-is-deprecated_0.patch"}}'
docker-compose exec -T web composer require --dev cweagans/composer-patches
- name: PhpCS
run: |
Expand Down
2 changes: 1 addition & 1 deletion collabora_online.info.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Collabora Online
description: Integrate Collabora Online for document viewing and editing.
package: Custom
package: Collabora Online
configure: collabora-online.settings
dependencies:
- drupal:media
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"drupal/core-composer-scaffold": "^10.3.6",
"drupal/core-dev": "^10.3.6",
"drupal/core-recommended": "^10.3.6",
"drupal/groupmedia": "^4",
"drush/drush": "^12.4",
"openeuropa/task-runner": "^2@dev",
"openeuropa/task-runner-drupal-project-symlink": "^1.0.0-beta6",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Collabora Online Group
description: Integrates Collabora Online with Group module
package: Collabora Online
dependencies:
- collabora_online:collabora_online
- groupmedia:groupmedia

type: module
core_version_requirement: ^10
36 changes: 36 additions & 0 deletions modules/collabora_online_group/tests/src/Functional/SmokeTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php

declare(strict_types=1);

namespace Drupal\Tests\collabora_online_group\Functional;

use Drupal\Tests\BrowserTestBase;

/**
* Smoke test to check that CI is working.
*/
class SmokeTest extends BrowserTestBase {

/**
* {@inheritdoc}
*/
protected static $modules = [
'collabora_online_group',
];

/**
* {@inheritdoc}
*/
protected $defaultTheme = 'stark';

/**
* Tests that the module install correctly.
*
* To be removed when other tests are implemented.
*/
public function testModuleInstallation(): void {
$this->drupalGet('<front>');
$this->assertSession()->statusCodeEquals(200);
}

}
1 change: 1 addition & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<testsuites>
<testsuite name="Collabora Drupal">
<directory>./tests/src/</directory>
<directory>./modules/**/tests/src/</directory>
</testsuite>
</testsuites>
</phpunit>

0 comments on commit 6c2e3be

Please sign in to comment.