Merge branch 'dev' into issue_345

Author: grst

CHANGELOG.md

@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - [[#479](https://github.com/nf-core/differentialabundance/pull/479)] - Fixed rendering of "Differential feature details" tabs ([@SusiJo](https://github.com/SusiJo), reviewed by [@](https://github.com/))
+- [[#513](https://github.com/nf-core/differentialabundance/pull/513)] - Fix contrast schema to allow for zero-intercept models. ([@grst](https://github.com/grst), review by [@pinin4fjords](https://github.com/pinin4fjords)).
 - [[#476](https://github.com/nf-core/differentialabundance/pull/476)] - Fixed null.csv and warning at top of report ([@SusiJo](https://github.com/SusiJo), reviewed by [@pinin4fjords](https://github.com/pinin4fjords), [@atrigila](https://github.com/atrigila), [@maxulysse](https://github.com/maxulysse))
 - [[#358](https://github.com/nf-core/differentialabundance/pull/358)] - Fixed nf-tests not running due to `--changed-since HEAD^`([@atrigila](https://github.com/atrigila), review by [@pinin4fjords](https://github.com/pinin4fjords))
 - [[#344](https://github.com/nf-core/differentialabundance/pull/344)] - Fixed replacement of NA sub-strings

tests/assets/zero_intercept_contrasts.yml

@@ -0,0 +1,23 @@
+contrasts:
+  - id: treatment_effect_classic_comparison
+    comparison: ["treatment", "Control", "Treated"]
+
+  - id: treatment_plus_genotype
+    formula: "~ treatment + genotype"
+    make_contrasts_str: "treatmentTreated"
+
+  - id: interaction_genotype_treatment
+    formula: "~ genotype * treatment"
+    make_contrasts_str: "genotypeWT.treatmentTreated"
+
+  - id: full_model_with_interactions
+    formula: "~ genotype * treatment * time"
+    make_contrasts_str: "genotypeWT.treatmentTreated.time"
+
+  - id: zero_intercept_model_1
+    formula: "~ 0 + genotype"
+    make_contrasts_str: "genotypeWT"
+
+  - id: zero_intercept_model_2
+    formula: "~ genotype - 1"
+    make_contrasts_str: "genotypeWT"

tests/test_rnaseq_dream.nf.test

@@ -67,6 +67,35 @@ nextflow_pipeline {
         }
     }
 
+    test("Test rnaseq dream profile - complex contrast - with zero intercept") {
+        when {
+            params {
+                outdir        = "$outputDir"
+                contrasts_yml = "$projectDir/tests/assets/zero_intercept_contrasts.yml"
+            }
+        }
+
+        then {
+            // stable_name: All files + folders in ${params.outdir}/ with a stable name
+            def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}'])
+            // stable_path: All files in ${params.outdir}/ with stable content
+            def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore')
+            assertAll(
+                { assert workflow.success},
+                { assert snapshot(
+                    // Number of successful tasks
+                    workflow.trace.succeeded().size(),
+                    // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions
+                    removeNextflowVersion("$outputDir/pipeline_info/nf_core_differentialabundance_software_versions.yml"),
+                    // All stable path name, with a relative path
+                    stable_name,
+                    // All files with stable contents
+                    stable_path
+                ).match() }
+                )
+        }
+    }
+
     test("Test rnaseq dream profile - with decoupler") {
 
         when {