Skip to content

Commit

Permalink
Merge pull request #2060 from antgonza/fix-1961
Browse files Browse the repository at this point in the history
fix #1961
  • Loading branch information
wasade committed Jan 28, 2017
2 parents 19889f9 + 1f1e826 commit 4e380e0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
6 changes: 6 additions & 0 deletions qiita_db/support_files/patches/49.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
-- Jan 27, 2017
-- sequeneces -> sequences

UPDATE qiita.artifact_type SET description = 'Demultiplexed and QC sequences'
WHERE artifact_type = 'Demultiplexed'
AND description = 'Demultiplexed and QC sequeneces';
4 changes: 2 additions & 2 deletions qiita_db/test/test_artifact.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def test_iter_public(self):
def test_create_type(self):
obs = qdb.artifact.Artifact.types()
exp = [['BIOM', 'BIOM table'],
['Demultiplexed', 'Demultiplexed and QC sequeneces'],
['Demultiplexed', 'Demultiplexed and QC sequences'],
['FASTA', None], ['FASTA_Sanger', None], ['FASTQ', None],
['SFF', None], ['per_sample_FASTQ', None]]
self.assertItemsEqual(obs, exp)
Expand All @@ -57,7 +57,7 @@ def test_create_type(self):

obs = qdb.artifact.Artifact.types()
exp = [['BIOM', 'BIOM table'],
['Demultiplexed', 'Demultiplexed and QC sequeneces'],
['Demultiplexed', 'Demultiplexed and QC sequences'],
['FASTA', None], ['FASTA_Sanger', None], ['FASTQ', None],
['SFF', None], ['per_sample_FASTQ', None],
['NewType', 'NewTypeDesc']]
Expand Down
2 changes: 1 addition & 1 deletion qiita_pet/handlers/api_proxy/tests/test_artifact.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def test_artifact_types_get_req(self):
exp = {'message': '',
'status': 'success',
'types': [['BIOM', 'BIOM table'],
['Demultiplexed', 'Demultiplexed and QC sequeneces'],
['Demultiplexed', 'Demultiplexed and QC sequences'],
['FASTA', None],
['FASTA_Sanger', None],
['FASTQ', None],
Expand Down

0 comments on commit 4e380e0

Please sign in to comment.