Skip to content

fix #1961 #2060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2017
Merged

fix #1961 #2060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions qiita_db/support_files/patches/49.sql
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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