Commit 7ec2049d authored by Lauri Himanen's avatar Lauri Himanen
Browse files

Merge branch 'v0.8.0' into encyclopedia-api

parents 8de11a91 918e47ad
import React, { Component, useContext, useState, useEffect } from 'react'
import React, { useContext, useState, useEffect } from 'react'
import { matchPath, useLocation, useHistory, useRouteMatch } from 'react-router-dom'
import Viewer from './Viewer'
import PropTypes from 'prop-types'
import { withApi, apiContext } from '../api'
import { apiContext } from '../api'
import MetainfoSearch from './MetainfoSearch'
import { FormControl, withStyles, Select, Input, MenuItem, ListItemText, InputLabel, makeStyles } from '@material-ui/core'
import { compose } from 'recompose'
import { FormControl, Select, Input, MenuItem, ListItemText, InputLabel, makeStyles } from '@material-ui/core'
import { schema } from '../MetaInfoRepository'
import { errorContext } from '../errors'
......
......@@ -651,17 +651,6 @@ class TestArchive(UploadFilesBasedTests):
rv = api.get('/archive/%s' % 'doesnt/exist', headers=auth_headers)
assert rv.status_code == 404
@pytest.mark.parametrize('info', [
'all.nomadmetainfo.json',
'all.experimental.nomadmetainfo.json',
'vasp.nomadmetainfo.json',
'mpes.nomadmetainfo.json'])
def test_get_metainfo(self, api, info):
rv = api.get('/archive/metainfo/%s' % info)
assert rv.status_code == 200
metainfo = json.loads((rv.data))
assert len(metainfo) > 0
@pytest.mark.parametrize('compress', [False, True])
def test_archive_zip_dowload_upload_id(self, api, non_empty_processed, test_user_auth, compress):
url = '/archive/download?upload_id=%s&compress=%s' % (non_empty_processed.upload_id, 'true' if compress else 'false')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment