Merge branch 'develop' into jc/promesa

.env

@@ -34,3 +34,4 @@ STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 TEST_STATEOFUS=1
 FAST_CREATE_COMMUNITY_ENABLED=1
+TEST_NETWORKS_ENABLED=1

.env.e2e

@@ -33,3 +33,4 @@ TWO_MINUTES_SYNCING=1
 STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
+TEST_NETWORKS_ENABLED=1

.env.jenkins

@@ -35,3 +35,4 @@ ENABLE_QUO_PREVIEW=1
 STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
+TEST_NETWORKS_ENABLED=1

.env.nightly

@@ -22,3 +22,4 @@ COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
 DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
+TEST_NETWORKS_ENABLED=0

.env.release

@@ -20,3 +20,4 @@ MAX_IMAGES_BATCH=1
 DELETE_MESSAGE_ENABLED=1
 COLLECTIBLES_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
+TEST_NETWORKS_ENABLED=0

Makefile

@@ -375,25 +375,25 @@ test-contract: export SHADOW_NS_REGEXP := ^tests\.contract-test.*$$
 test-contract: ##@test Run contract tests
 test-contract: _test-clojure
 
-android-test: jsbundle
-android-test: export TARGET := android
-android-test:
+test-android: jsbundle
+test-android: export TARGET := android
+test-android: ##@test Android Gradle test
  cd android && ./gradlew test
 
-component-test-watch: export TARGET := clojure
-component-test-watch: export COMPONENT_TEST := true
-component-test-watch: export BABEL_ENV := test
-component-test-watch: export JEST_USE_SILENT_REPORTER := false
-component-test-watch: ##@ Watch tests and re-run no changes to cljs files
+test-component-watch: export TARGET := clojure
+test-component-watch: export COMPONENT_TEST := true
+test-component-watch: export BABEL_ENV := test
+test-component-watch: export JEST_USE_SILENT_REPORTER := false
+test-component-watch: ##@ Watch tests and re-run no changes to cljs files
  @scripts/check-metro-shadow-process.sh
  rm -rf ./component-spec
  nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs
 
-component-test: export TARGET := clojure
-component-test: export COMPONENT_TEST := true
-component-test: export BABEL_ENV := test
-component-test: export JEST_USE_SILENT_REPORTER := false
-component-test: ##@test Run component tests once in NodeJS
+test-component: export TARGET := clojure
+test-component: export COMPONENT_TEST := true
+test-component: export BABEL_ENV := test
+test-component: export JEST_USE_SILENT_REPORTER := false
+test-component: ##@test Run component tests once in NodeJS
  @scripts/check-metro-shadow-process.sh
  rm -rf ./component-spec
  yarn shadow-cljs compile component-test && \

ci/Jenkinsfile.android

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.11'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -34,10 +34,10 @@ pipeline {
  }
 
  environment {
- LANG = "en_US.UTF-8"
- LC_ALL = "en_US.UTF-8"
- LANGUAGE = "en_US.UTF-8"
- TARGET  = "android${utils.isE2EBuild() ? "-e2e" : ""}"
+ LANG = 'en_US.UTF-8'
+ LC_ALL = 'en_US.UTF-8'
+ LANGUAGE = 'en_US.UTF-8'
+ PLATFORM = "android${utils.isE2EBuild() ? "-e2e" : ""}"
  BUILD_ENV = 'prod'
  NIX_CONF_DIR = "${env.WORKSPACE}/nix"
  FASTLANE_DISABLE_COLORS = 1

ci/Jenkinsfile.combined

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.11'
 
 pipeline {
  agent { label 'linux' }

ci/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.11'
 
 pipeline {
  agent { label 'linux' }

ci/Jenkinsfile.ios

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.11'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -34,10 +34,10 @@ pipeline {
  }
 
  environment {
- LANG = "en_US.UTF-8"
- LC_ALL = "en_US.UTF-8"
- LANGUAGE = "en_US.UTF-8"
- TARGET  = 'ios'
+ LANG = 'en_US.UTF-8'
+ LC_ALL = 'en_US.UTF-8'
+ LANGUAGE = 'en_US.UTF-8'
+ PLATFORM = 'ios'
  NIX_CONF_DIR = "${env.WORKSPACE}/nix"
  FASTLANE_DISABLE_COLORS = 1
  BUNDLE_PATH = "${HOME}/.bundle"

ci/Jenkinsfile.tests

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.11'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -29,61 +29,47 @@ pipeline {
  description: 'Specify build type. Values: pr / e2e / nightly / release',
  defaultValue: 'pr',
  )
+ booleanParam(
+ name: 'RUN_CONTRACT_TESTS',
+ description: 'Whether to run optional and slow contract tests.',
+ defaultValue: false,
+ )
  }
 
  environment {
- LANG = "en_US.UTF-8"
- LC_ALL = "en_US.UTF-8"
- LANGUAGE = "en_US.UTF-8"
- TARGET  = 'tests'
+ LANG = 'en_US.UTF-8'
+ LC_ALL = 'en_US.UTF-8'
+ LANGUAGE = 'en_US.UTF-8'
+ PLATFORM = 'tests'
  BUILD_ENV = 'prod'
  NIX_CONF_DIR = "${env.WORKSPACE}/nix"
  LOG_FILE = utils.pkgFilename(ext: 'log', arch: 'tests')
+ CLJ_LINTER_PRINT_WARNINGS = 'true'
  }
 
  stages {
- stage('Checks') {
+ stage('Test') {
  parallel {
  stage('Lint') {
- steps {
- sh """#!/bin/bash
- set -eo pipefail
- make lint CLJ_LINTER_PRINT_WARNINGS=true 2>&1 | tee ${LOG_FILE}
- """
- }
+ steps { make('lint') }
  }
- stage('Unit Tests') {
- steps {
- sh """#!/bin/bash
- set -eo pipefail
- make test-unit 2>&1 | tee -a ${LOG_FILE}
- """
- }
+ stage('Unit') {
+ steps { make('test-unit') }
+ }
+ stage('Component') {
+ steps { make('test-component') }
  }
  }
  }
- stage('Contract Tests') {
- steps {
- sh """#!/bin/bash
- set -eo pipefail
- make test-contract 2>&1 | tee -a ${LOG_FILE}
- """
- }
- }
- stage('Integration Tests') {
- steps {
- sh """#!/bin/bash
- set -eo pipefail
- make test-integration 2>&1 | tee -a ${LOG_FILE}
- """
- }
- }
- stage('Component Tests') {
- steps {
- sh """#!/bin/bash
- set -eo pipefail
- make component-test 2>&1 | tee -a ${LOG_FILE}
- """
+ stage('Heavy Test') {
+ parallel {
+ stage('Contract') {
+ when { expression { params.RUN_CONTRACT_TESTS } }
+ steps { make('test-contract') }
+ }
+ stage('Integration') {
+ steps { make('test-integration') }
+ }
  }
  }
  stage('Upload') {
@@ -100,3 +86,10 @@ pipeline {
  always { sh 'make purge' }
  }
 }
+
+def make(target) {
+ sh """#!/bin/bash
+ set -eo pipefail
+ make ${target} 2>&1 | tee -a ${LOG_FILE}
+ """
+}

ci/tests/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.11'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-prs

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.11'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-upgrade

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.11'
 
 pipeline {
 

ci/tools/Jenkinsfile.fastlane-clean

@@ -1,14 +1,14 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.11'
 
 pipeline {
  agent { label 'macos' }
 
  environment {
- LANG  = 'en_US.UTF-8'
- LANGUAGE  = 'en_US.UTF-8'
- LC_ALL  = 'en_US.UTF-8'
- TARGET  = 'ios'
+ LANG = 'en_US.UTF-8'
+ LANGUAGE = 'en_US.UTF-8'
+ LC_ALL = 'en_US.UTF-8'
+ PLATFORM = 'ios'
  FASTLANE_DISABLE_COLORS = 1
  /* avoid writing to r/o /nix */
  GEM_HOME = '~/.rubygems'

ci/tools/Jenkinsfile.nix-cache

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.11'
 
 pipeline {
  agent { label params.AGENT_LABEL }

ci/tools/Jenkinsfile.playstore-meta

@@ -1,14 +1,14 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.11'
 
 pipeline {
  agent { label 'linux' }
 
  environment {
- LANG  = 'en_US.UTF-8'
- LANGUAGE  = 'en_US.UTF-8'
- LC_ALL  = 'en_US.UTF-8'
- TARGET  = 'ios'
+ LANG = 'en_US.UTF-8'
+ LANGUAGE = 'en_US.UTF-8'
+ LC_ALL = 'en_US.UTF-8'
+ PLATFORM = 'ios'
  FASTLANE_DISABLE_COLORS = 1
  /* avoid writing to r/o /nix */
  GEM_HOME = '~/.rubygems'

ci/tools/Jenkinsfile.xcode-clean

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.11'
 
 pipeline {
  agent {

doc/component-tests-overview.md

@@ -16,10 +16,10 @@ Both of these links are showing it for React-Testing-Library (not Native) howeve
 ## Running the tests
 To run these tests there are two methods.
 
-`make component-test` 
+`make test-component`
 setups and runs the test suite once.
 
-`make component-test-watch` 
+`make test-component-watch`
 setups and runs the test suite and watches for code changes will then retrigger the test suite.
 
 ## Writing Tests
@@ -38,7 +38,7 @@ There is a file of utility functions defined in "src/test_helpers/component.cljs
 ## Configuration
 Status Mobile has a bespoke tech stack, as such there is more complexities to configuring the tests.
 
-### Shadow-CLJS 
+### Shadow-CLJS
 the configuration for compiling our tests are defined in the "shadow-cljs.edn" file.
 The three main parts of this are
 `:target :npm-module`
@@ -47,9 +47,9 @@ Needed for the configuration we are using
 a vector of entry points for the test files.
 and the `ns-regexp` to specify what tests to find. Since we have multiple forms of tests we decided that "component-spec" is the least likely to detect the wrong file type.
 
-It's worth knowing that our tests are compiled to JS and then run in the temporary folder `component-tests`. 
+It's worth knowing that our tests are compiled to JS and then run in the temporary folder `component-tests`.
 
 ### Jest
 There is also further configuration for Jest in "test/jest". There is a jest config file which has some mostly standard configuration pieces, where the tests live, what environment variables are set etc. This is documented by Jest here: https://jestjs.io/docs/configuration
 
-There is also a setup file which is used to set some global and default values. Additionally this file is used to mock some of the react native (among other) dependencies 
+There is also a setup file which is used to set some global and default values. Additionally this file is used to mock some of the react native (among other) dependencies.

doc/testing.md

@@ -54,13 +54,13 @@ Here I'm showing a terminal-only experience using Tmux (left pane Emacs, right p
 To run tests:
 
 ```
-make component-test
+make test-component
 ```
 
 Also test watcher can be launched. It will re-run the entire test suite when any file is modified
 
 ```
-make component-test-watch
+make test-component-watch
 ```
 
 Check [component tests doc](./component-tests-overview.md) for more.

scripts/cut-release.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Increment a version string using Semantic Versioning (SemVer) terminology.