Rename integration tests in system tests

Integration tests is an expression that covers a lot of different ways to test, depending of the backgrounds of the people that use it. System tests is probably a better term in our case, as it is a less overloaded term. It was inspired by Rails projects.
cozy · Oct 3, 2023 · 0076104 · 0076104
1 parent 9037040
commit 0076104
Show file tree

Hide file tree

Showing 72 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/integration.yml → .github/workflows/system-tests.yml b/.github/workflows/integration.yml → .github/workflows/system-tests.yml
@@ -1,4 +1,4 @@
-name: Integration tests
+name: System tests
 on:
   push:
     branches:
@@ -9,7 +9,7 @@ on:
     paths-ignore:
       - 'docs/**'
 jobs:
-  integration:
+  system:
     runs-on: ubuntu-22.04
     services:
       mailhog:
@@ -54,4 +54,4 @@ jobs:
           go install
       - name: Test
         run: |
-          make integration-tests
+          make system-tests
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ scripts/golangci-lint: Makefile
 
 ## jslint: enforce a consistent code style for Js code
 jslint: scripts/node_modules
-	@scripts/node_modules/.bin/eslint -c scripts/eslintrc.json "assets/scripts/**" tests/integration/konnector/*.js
+	@scripts/node_modules/.bin/eslint -c scripts/eslintrc.json "assets/scripts/**" tests/system/konnector/*.js
 .PHONY: jslint
 
 ## pretty: make the assets prettier
@@ -74,10 +74,10 @@ unit-tests:
 	@go test -p 1 -timeout 2m -short ./...
 .PHONY: unit-tests
 
-## integration-tests: run the tests
-integration-tests:
-	@scripts/integration-test.sh
-.PHONY: integration-tests
+## system-tests: run the tests
+system-tests:
+	@scripts/system-test.sh
+.PHONY: system-tests
 
 ## clean: clean the generated files and directories
 clean:

diff --git a/cmd/tools.go b/cmd/tools.go
@@ -90,10 +90,10 @@ var encryptRSACmd = &cobra.Command{
 	Use:   "encrypt-with-rsa <key> <payload",
 	Short: "encrypt a payload in RSA",
 	Long: `
-This command is used by integration tests to encrypt bitwarden organization
-keys. It takes the public or private key of the user and the payload (= the
-organization key) as inputs (both encoded in base64), and print on stdout the
-encrypted data (encoded as base64 too).
+This command is used by system tests to encrypt bitwarden organization keys. It
+takes the public or private key of the user and the payload (= the organization
+key) as inputs (both encoded in base64), and print on stdout the encrypted data
+(encoded as base64 too).
 `,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if len(args) != 2 {

diff --git a/docs/cli/cozy-stack_tools_encrypt-with-rsa.md b/docs/cli/cozy-stack_tools_encrypt-with-rsa.md
@@ -5,10 +5,10 @@ encrypt a payload in RSA
 ### Synopsis
 
 
-This command is used by integration tests to encrypt bitwarden organization
-keys. It takes the public or private key of the user and the payload (= the
-organization key) as inputs (both encoded in base64), and print on stdout the
-encrypted data (encoded as base64 too).
+This command is used by system tests to encrypt bitwarden organization keys. It
+takes the public or private key of the user and the payload (= the organization
+key) as inputs (both encoded in base64), and print on stdout the encrypted data
+(encoded as base64 too).
 
 
 ```

diff --git a/model/job/mem_scheduler.go b/model/job/mem_scheduler.go
@@ -53,11 +53,11 @@ func (s *memScheduler) StartScheduler(b Broker) error {
 	go s.thumb.Schedule()
 
 	// XXX The memory scheduler loads the triggers from CouchDB when the stack
-	// is started. This can cause some stability issues when running
-	// integration tests in parallel. To avoid that, an env variable
+	// is started. This can cause some stability issues when running system
+	// tests in parallel. To avoid that, an env variable
 	// COZY_SKIP_LOADING_TRIGGERS can be set to skip loading the triggers from
-	// CouchDB. It is correct for integration tests, as instances are created
-	// and destroyed by the same process. But, it should not be used elsewhere.
+	// CouchDB. It is correct for system tests, as instances are created and
+	// destroyed by the same process. But, it should not be used elsewhere.
 	for _, env := range os.Environ() {
 		if strings.HasPrefix(env, "COZY_SKIP_LOADING_TRIGGERS=") {
 			return nil

diff --git a/scripts/integration-test.sh → scripts/system-test.sh b/scripts/integration-test.sh → scripts/system-test.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -ev
 
-cd tests/integration
+cd tests/system
 sudo npm install -g @bitwarden/cli@1.16.0
 
 bundle install --jobs=3 --retry=3

diff --git a/tests/integration/Gemfile → tests/system/Gemfile b/tests/integration/Gemfile → tests/system/Gemfile
diff --git a/tests/integration/Gemfile.lock → tests/system/Gemfile.lock b/tests/integration/Gemfile.lock → tests/system/Gemfile.lock
diff --git a/tests/integration/README.md → tests/system/README.md b/tests/integration/README.md → tests/system/README.md
@@ -1,4 +1,4 @@
-# Tools for integration tests
+# Tools for system tests
 
 ## Install
 
@@ -7,7 +7,7 @@ apt install ruby ruby-dev
 gem install bundler
 cd cozy-stack
 go install
-cd tests/integration
+cd tests/system
 bundle install
 npm install -g @bitwarden/cli@1.16.0
 ```
@@ -74,7 +74,7 @@ it with swifttest:
 
 ```sh
 $ go run ./tests/swift
-$ cd tests/integration
+$ cd tests/system
 $ export COZY_SWIFTTEST=1
 $ bundle exec ruby tests/sharing_push_folder.rb
 ```

diff --git a/tests/integration/boot.rb → tests/system/boot.rb b/tests/integration/boot.rb → tests/system/boot.rb
diff --git a/tests/integration/clean.rb → tests/system/clean.rb b/tests/integration/clean.rb → tests/system/clean.rb
diff --git a/tests/integration/console.rb → tests/system/console.rb b/tests/integration/console.rb → tests/system/console.rb
diff --git a/tests/integration/hammer-runner.sh → tests/system/hammer-runner.sh b/tests/integration/hammer-runner.sh → tests/system/hammer-runner.sh
@@ -2,8 +2,8 @@
 set -e
 
 # Usage: ./hammer-runner.sh tests/accounts_cleaning.rb
-# It will launch the same integration tests in a loop until it fails (up to 100
-# tries). It is useful for trying to trigger an error on an integration test
+# It will launch the same system tests in a loop until it fails (up to 100
+# tries). It is useful for trying to trigger an error on an system test
 # that fails on some conditions that happen sometimes, but not very often.
 
 bundle exec ruby clean.rb

diff --git a/tests/integration/konnector/index.js → tests/system/konnector/index.js b/tests/integration/konnector/index.js → tests/system/konnector/index.js
diff --git a/.../integration/konnector/manifest.konnector → tests/system/konnector/manifest.konnector b/.../integration/konnector/manifest.konnector → tests/system/konnector/manifest.konnector
diff --git a/tests/integration/konnector/on_delete.js → tests/system/konnector/on_delete.js b/tests/integration/konnector/on_delete.js → tests/system/konnector/on_delete.js
diff --git a/tests/integration/lib/accept.rb → tests/system/lib/accept.rb b/tests/integration/lib/accept.rb → tests/system/lib/accept.rb
diff --git a/tests/integration/lib/account.rb → tests/system/lib/account.rb b/tests/integration/lib/account.rb → tests/system/lib/account.rb
diff --git a/tests/integration/lib/album.rb → tests/system/lib/album.rb b/tests/integration/lib/album.rb → tests/system/lib/album.rb
diff --git a/tests/integration/lib/bitwarden.rb → tests/system/lib/bitwarden.rb b/tests/integration/lib/bitwarden.rb → tests/system/lib/bitwarden.rb
diff --git a/tests/integration/lib/bitwarden/cipher.rb → tests/system/lib/bitwarden/cipher.rb b/tests/integration/lib/bitwarden/cipher.rb → tests/system/lib/bitwarden/cipher.rb
diff --git a/...integration/lib/bitwarden/organization.rb → tests/system/lib/bitwarden/organization.rb b/...integration/lib/bitwarden/organization.rb → tests/system/lib/bitwarden/organization.rb
diff --git a/tests/integration/lib/bitwarden/user.rb → tests/system/lib/bitwarden/user.rb b/tests/integration/lib/bitwarden/user.rb → tests/system/lib/bitwarden/user.rb
diff --git a/tests/integration/lib/bootstrap.rb → tests/system/lib/bootstrap.rb b/tests/integration/lib/bootstrap.rb → tests/system/lib/bootstrap.rb
diff --git a/tests/integration/lib/contact.rb → tests/system/lib/contact.rb b/tests/integration/lib/contact.rb → tests/system/lib/contact.rb
diff --git a/tests/integration/lib/couch.rb → tests/system/lib/couch.rb b/tests/integration/lib/couch.rb → tests/system/lib/couch.rb
diff --git a/tests/integration/lib/cozy_file.rb → tests/system/lib/cozy_file.rb b/tests/integration/lib/cozy_file.rb → tests/system/lib/cozy_file.rb
diff --git a/tests/integration/lib/debug.rb → tests/system/lib/debug.rb b/tests/integration/lib/debug.rb → tests/system/lib/debug.rb
diff --git a/tests/integration/lib/email.rb → tests/system/lib/email.rb b/tests/integration/lib/email.rb → tests/system/lib/email.rb
diff --git a/tests/integration/lib/export.rb → tests/system/lib/export.rb b/tests/integration/lib/export.rb → tests/system/lib/export.rb
diff --git a/tests/integration/lib/folder.rb → tests/system/lib/folder.rb b/tests/integration/lib/folder.rb → tests/system/lib/folder.rb
diff --git a/tests/integration/lib/helpers.rb → tests/system/lib/helpers.rb b/tests/integration/lib/helpers.rb → tests/system/lib/helpers.rb
diff --git a/tests/integration/lib/import.rb → tests/system/lib/import.rb b/tests/integration/lib/import.rb → tests/system/lib/import.rb
diff --git a/tests/integration/lib/instance.rb → tests/system/lib/instance.rb b/tests/integration/lib/instance.rb → tests/system/lib/instance.rb
diff --git a/tests/integration/lib/job.rb → tests/system/lib/job.rb b/tests/integration/lib/job.rb → tests/system/lib/job.rb
diff --git a/tests/integration/lib/model.rb → tests/system/lib/model.rb b/tests/integration/lib/model.rb → tests/system/lib/model.rb
diff --git a/tests/integration/lib/move.rb → tests/system/lib/move.rb b/tests/integration/lib/move.rb → tests/system/lib/move.rb
diff --git a/tests/integration/lib/note.rb → tests/system/lib/note.rb b/tests/integration/lib/note.rb → tests/system/lib/note.rb
diff --git a/tests/integration/lib/notification.rb → tests/system/lib/notification.rb b/tests/integration/lib/notification.rb → tests/system/lib/notification.rb
diff --git a/tests/integration/lib/oauth/client.rb → tests/system/lib/oauth/client.rb b/tests/integration/lib/oauth/client.rb → tests/system/lib/oauth/client.rb
@@ -6,7 +6,7 @@ def self.create(inst)
       body = {
         redirect_uris: ["cozy://"],
         client_name: "test_#{Faker::Internet.slug}",
-        software_id: "github.com/cozy/cozy-stack/tests/integration"
+        software_id: "github.com/cozy/cozy-stack/tests/system"
       }
       opts = { content_type: :json, accept: :json }
       res = inst.client["/auth/register"].post body.to_json, opts

diff --git a/tests/integration/lib/office.rb → tests/system/lib/office.rb b/tests/integration/lib/office.rb → tests/system/lib/office.rb
diff --git a/tests/integration/lib/rule.rb → tests/system/lib/rule.rb b/tests/integration/lib/rule.rb → tests/system/lib/rule.rb
diff --git a/tests/integration/lib/settings.rb → tests/system/lib/settings.rb b/tests/integration/lib/settings.rb → tests/system/lib/settings.rb
diff --git a/tests/integration/lib/sharing.rb → tests/system/lib/sharing.rb b/tests/integration/lib/sharing.rb → tests/system/lib/sharing.rb
diff --git a/tests/integration/lib/stack.rb → tests/system/lib/stack.rb b/tests/integration/lib/stack.rb → tests/system/lib/stack.rb
@@ -156,7 +156,7 @@ def generate_token_for(inst, doctypes)
   def generate_client_id(inst)
     cmd = ["cozy-stack", "instances", "client-oauth", inst.domain,
            "--admin-port", @admin,
-           "http://localhost", "test-sharing", "github.com/cozy/cozy-stack/tests/integration"]
+           "http://localhost", "test-sharing", "github.com/cozy/cozy-stack/tests/system"]
     puts cmd.join(" ").green
     `#{cmd.join(" ")}`.chomp
   end

diff --git a/tests/integration/lib/test/cat_logs.rb → tests/system/lib/test/cat_logs.rb b/tests/integration/lib/test/cat_logs.rb → tests/system/lib/test/cat_logs.rb
diff --git a/tests/integration/lib/test/timeout.rb → tests/system/lib/test/timeout.rb b/tests/integration/lib/test/timeout.rb → tests/system/lib/test/timeout.rb
diff --git a/tests/integration/lib/trigger.rb → tests/system/lib/trigger.rb b/tests/integration/lib/trigger.rb → tests/system/lib/trigger.rb
diff --git a/tests/integration/parallel-runner.go → tests/system/parallel-runner.go b/tests/integration/parallel-runner.go → tests/system/parallel-runner.go
diff --git a/tests/integration/scalability/base_tests.rb → tests/system/scalability/base_tests.rb b/tests/integration/scalability/base_tests.rb → tests/system/scalability/base_tests.rb
diff --git a/...ntegration/scalability/inserts_deletes.rb → tests/system/scalability/inserts_deletes.rb b/...ntegration/scalability/inserts_deletes.rb → tests/system/scalability/inserts_deletes.rb
diff --git a/tests/integration/scalability/large_files.rb → tests/system/scalability/large_files.rb b/tests/integration/scalability/large_files.rb → tests/system/scalability/large_files.rb
diff --git a/tests/integration/scalability/random.rb → tests/system/scalability/random.rb b/tests/integration/scalability/random.rb → tests/system/scalability/random.rb
diff --git a/tests/integration/scalability/recipients.rb → tests/system/scalability/recipients.rb b/tests/integration/scalability/recipients.rb → tests/system/scalability/recipients.rb
diff --git a/tests/integration/scalability/sharings.rb → tests/system/scalability/sharings.rb b/tests/integration/scalability/sharings.rb → tests/system/scalability/sharings.rb
diff --git a/tests/integration/scalability/trash.rb → tests/system/scalability/trash.rb b/tests/integration/scalability/trash.rb → tests/system/scalability/trash.rb
diff --git a/tests/integration/scalability/updates.rb → tests/system/scalability/updates.rb b/tests/integration/scalability/updates.rb → tests/system/scalability/updates.rb
diff --git a/.../integration/tests/accounts-to-ciphers.rb → tests/system/tests/accounts-to-ciphers.rb b/.../integration/tests/accounts-to-ciphers.rb → tests/system/tests/accounts-to-ciphers.rb
diff --git a/tests/integration/tests/accounts_cleaning.rb → tests/system/tests/accounts_cleaning.rb b/tests/integration/tests/accounts_cleaning.rb → tests/system/tests/accounts_cleaning.rb
diff --git a/tests/integration/tests/bitwarden_cli.rb → tests/system/tests/bitwarden_cli.rb b/tests/integration/tests/bitwarden_cli.rb → tests/system/tests/bitwarden_cli.rb
diff --git a/tests/integration/tests/export_import.rb → tests/system/tests/export_import.rb b/tests/integration/tests/export_import.rb → tests/system/tests/export_import.rb
diff --git a/tests/integration/tests/moving_a_cozy.rb → tests/system/tests/moving_a_cozy.rb b/tests/integration/tests/moving_a_cozy.rb → tests/system/tests/moving_a_cozy.rb
diff --git a/tests/integration/tests/multiple_sharings.rb → tests/system/tests/multiple_sharings.rb b/tests/integration/tests/multiple_sharings.rb → tests/system/tests/multiple_sharings.rb
diff --git a/tests/integration/tests/notification.rb → tests/system/tests/notification.rb b/tests/integration/tests/notification.rb → tests/system/tests/notification.rb
diff --git a/.../integration/tests/onboarding_flagship.rb → tests/system/tests/onboarding_flagship.rb b/.../integration/tests/onboarding_flagship.rb → tests/system/tests/onboarding_flagship.rb
diff --git a/tests/integration/tests/revoke_sharing.rb → tests/system/tests/revoke_sharing.rb b/tests/integration/tests/revoke_sharing.rb → tests/system/tests/revoke_sharing.rb
diff --git a/tests/integration/tests/selective_sync.rb → tests/system/tests/selective_sync.rb b/tests/integration/tests/selective_sync.rb → tests/system/tests/selective_sync.rb
diff --git a/.../integration/tests/sendmail_attachment.rb → tests/system/tests/sendmail_attachment.rb b/.../integration/tests/sendmail_attachment.rb → tests/system/tests/sendmail_attachment.rb
diff --git a/...tegration/tests/sharing_moves_n_delete.rb → tests/system/tests/sharing_moves_n_delete.rb b/...tegration/tests/sharing_moves_n_delete.rb → tests/system/tests/sharing_moves_n_delete.rb
diff --git a/...ntegration/tests/sharing_referenced_by.rb → tests/system/tests/sharing_referenced_by.rb b/...ntegration/tests/sharing_referenced_by.rb → tests/system/tests/sharing_referenced_by.rb
diff --git a/...ntegration/tests/sharing_remove_folder.rb → tests/system/tests/sharing_remove_folder.rb b/...ntegration/tests/sharing_remove_folder.rb → tests/system/tests/sharing_remove_folder.rb
diff --git a/tests/integration/tests/trigger_webhook.rb → tests/system/tests/trigger_webhook.rb b/tests/integration/tests/trigger_webhook.rb → tests/system/tests/trigger_webhook.rb