From ff6f0642d29e80864895bd1e50e8c3d7ce0fd56d Mon Sep 17 00:00:00 2001
From: drpatelh <drhpatel@gmail.com>
Date: Wed, 3 Feb 2021 17:43:14 +0000
Subject: [PATCH] Fix multiqc tests

---
 .github/filters.yml             |  1 +
 tests/software/multiqc/main.nf  | 18 +++++++++---------
 tests/software/multiqc/test.yml |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/filters.yml b/.github/filters.yml
index c0b8a9aa..8bdb79be 100644
--- a/.github/filters.yml
+++ b/.github/filters.yml
@@ -49,6 +49,7 @@ gffread:
   - tests/software/gffread/**
 
 multiqc:
+  - software/fastqc/**
   - software/multiqc/**
   - tests/software/multiqc/**
 
diff --git a/tests/software/multiqc/main.nf b/tests/software/multiqc/main.nf
index 06b466ab..9d7ec3aa 100644
--- a/tests/software/multiqc/main.nf
+++ b/tests/software/multiqc/main.nf
@@ -2,15 +2,15 @@
 
 nextflow.enable.dsl = 2
 
-include { MULTIQC } from '../../../software/multiqc/main.nf' addParams(options: [publish_dir: 'test_multiqc'])
-include { test_paired_end } from '../fastqc/main.nf' addParams(options: [publish_dir: 'test_paired_end'])
+include { FASTQC  } from '../../../software/fastqc/main.nf'  addParams( options: [:] )
+include { MULTIQC } from '../../../software/multiqc/main.nf' addParams( options: [:] )
 
 workflow test_multiqc {
-    test_paired_end()
-
-    input = [
-        test_paired_end.out.zip.collect { it[1] }.ifEmpty([])
-    ]
-
-    MULTIQC(*input)
+    
+    def input = []
+    input = [ [ id: 'test', single_end: false ],
+              [ file("${launchDir}/tests/data/fastq/rna/test_R1.fastq.gz", checkIfExists: true),
+                file("${launchDir}/tests/data/fastq/rna/test_R2.fastq.gz", checkIfExists: true) ] ]
+    FASTQC  ( input )
+    MULTIQC ( FASTQC.out.zip.collect { it[1] } )
 }
diff --git a/tests/software/multiqc/test.yml b/tests/software/multiqc/test.yml
index 68df353d..72ce58f1 100644
--- a/tests/software/multiqc/test.yml
+++ b/tests/software/multiqc/test.yml
@@ -1,7 +1,7 @@
 - name: multiqc
-  command: nextflow run ./tests/software/multiqc/ -entry test_multiqc -c tests/config/nextflow.config
+  command: nextflow run ./tests/software/multiqc -entry test_multiqc -c tests/config/nextflow.config
   tags:
     - multiqc
   files:
-    - path: output/test_multiqc/multiqc_report.html
+    - path: output/multiqc/multiqc_report.html