Skip to content

Commit

Permalink
Merge branch 'main' into data-tables
Browse files Browse the repository at this point in the history
  • Loading branch information
@bess
bess committed Feb 16, 2023
2 parents 2da7e32 + 28daada commit bda675c
Show file tree
Hide file tree
Showing 5 changed files with 199 additions and 17 deletions.
181 changes: 180 additions & 1 deletion spec/system/data_migration/femtosecond.xml
View file
Original file line number Diff line number Diff line change
@@ -1 +1,180 @@
<todo />
<resource xsi:schemaLocation='http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4/metadata.xsd' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://datacite.org/schema/kernel-4'>
<identifier identifierType='DOI'>10.34770/gg40-tc15</identifier>
<creators>
<creator>
<creatorName>Kim, Donghoon</creatorName>
<givenName>Donghoon</givenName>
<familyName>Kim</familyName>
</creator>
<creator>
<creatorName>Tracy, Sally J</creatorName>
<givenName>Sally J</givenName>
<familyName>Tracy</familyName>
</creator>
<creator>
<creatorName>Smith, Raymond F</creatorName>
<givenName>Raymond F</givenName>
<familyName>Smith</familyName>
</creator>
<creator>
<creatorName>Gleason, Arianna E</creatorName>
<givenName>Arianna E</givenName>
<familyName>Gleason</familyName>
</creator>
<creator>
<creatorName>Bolme, Cindy A</creatorName>
<givenName>Cindy A</givenName>
<familyName>Bolme</familyName>
</creator>
<creator>
<creatorName>Prakapenka, Vitali B</creatorName>
<givenName>Vitali B</givenName>
<familyName>Prakapenka</familyName>
</creator>
<creator>
<creatorName>Appel, Karen</creatorName>
<givenName>Karen</givenName>
<familyName>Appel</familyName>
</creator>
<creator>
<creatorName>Speziable, Sergio</creatorName>
<givenName>Sergio</givenName>
<familyName>Speziable</familyName>
</creator>
<creator>
<creatorName>Wicks, June K</creatorName>
<givenName>June K</givenName>
<familyName>Wicks</familyName>
</creator>
<creator>
<creatorName>Berryman, Eleanor J</creatorName>
<givenName>Eleanor J</givenName>
<familyName>Berryman</familyName>
</creator>
<creator>
<creatorName>Han, Sirus K</creatorName>
<givenName>Sirus K</givenName>
<familyName>Han</familyName>
</creator>
<creator>
<creatorName>Schoelmerich, Markus O</creatorName>
<givenName>Markus O</givenName>
<familyName>Schoelmerich</familyName>
</creator>
<creator>
<creatorName>Lee, Hae Ja</creatorName>
<givenName>Hae Ja</givenName>
<familyName>Lee</familyName>
</creator>
<creator>
<creatorName>Nagler, Bob</creatorName>
<givenName>Bob</givenName>
<familyName>Nagler</familyName>
</creator>
<creator>
<creatorName>Cunningham, Eric F</creatorName>
<givenName>Eric F</givenName>
<familyName>Cunningham</familyName>
</creator>
<creator>
<creatorName>Akin, Minta C</creatorName>
<givenName>Minta C</givenName>
<familyName>Akin</familyName>
</creator>
<creator>
<creatorName>Asimow, Paul D</creatorName>
<givenName>Paul D</givenName>
<familyName>Asimow</familyName>
</creator>
<creator>
<creatorName>Eggert, Jon H</creatorName>
<givenName>Jon H</givenName>
<familyName>Eggert</familyName>
</creator>
<creator>
<creatorName>Duffy, Thomas S</creatorName>
<givenName>Thomas S</givenName>
<familyName>Duffy</familyName>
</creator>
</creators>
<titles>
<title>Femtosecond X-ray Diffraction of Laser-shocked Forsterite (Mg2SiO4) to 122 GPa</title>
</titles>
<publisher>Princeton University</publisher>
<resourceType resourceTypeGeneral='Dataset'/>
<publicationYear>2020</publicationYear>
<fundingReferences>
<fundingReference>
<funderName>United States Department of Energy</funderName>
<funderIdentifier funderIdentifierType='ROR'>https://ror.org/01bj3aw27</funderIdentifier>
<awardNumber awardURI=''>DE-SC0018925</awardNumber>
</fundingReference>
<fundingReference>
<funderName>United States Department of Energy</funderName>
<funderIdentifier funderIdentifierType='ROR'>https://ror.org/01bj3aw27</funderIdentifier>
<awardNumber awardURI=''>DE-AC02-76SF00515</awardNumber>
</fundingReference>
<fundingReference>
<funderName>National Science Foundation</funderName>
<funderIdentifier funderIdentifierType='ROR'>https://ror.org/021nxhr62</funderIdentifier>
<awardNumber awardURI=''>EAR-1644614</awardNumber>
</fundingReference>
<fundingReference>
<funderName>National Science Foundation</funderName>
<funderIdentifier funderIdentifierType='ROR'>https://ror.org/021nxhr62</funderIdentifier>
<awardNumber awardURI=''>EAR-1446969</awardNumber>
</fundingReference>
<fundingReference>
<funderName>National Science Foundation</funderName>
<funderIdentifier funderIdentifierType='ROR'>https://ror.org/021nxhr62</funderIdentifier>
<awardNumber awardURI=''>EAR-1725349</awardNumber>
</fundingReference>
<fundingReference>
<funderName>Deutsche Forschungsgemeinschaft</funderName>
<funderIdentifier funderIdentifierType='ROR'>https://ror.org/018mejw64</funderIdentifier>
<awardNumber awardURI=''>AP 262/2-1</awardNumber>
</fundingReference>
<fundingReference>
<funderName>Deutsche Forschungsgemeinschaft</funderName>
<funderIdentifier funderIdentifierType='ROR'>https://ror.org/018mejw64</funderIdentifier>
<awardNumber awardURI=''>FOR2440</awardNumber>
</fundingReference>
</fundingReferences>
<relatedIdentifiers>
<relatedIdentifier relationType='IsIdenticalTo' relatedIdentifierType='ARK'>ark:/88435/dsp01rj4307478</relatedIdentifier>
</relatedIdentifiers>
<version>1</version>
<rightsList>
<rights rightsURI='https://creativecommons.org/licenses/by/4.0/' rightsIdentifier='CC BY'>Creative Commons Attribution 4.0 International</rights>
</rightsList>
<descriptions>
<description descriptionType='Other'>
The behavior of forsterite, Mg2SiO4, under dynamic compression is of
fundamental importance for understanding its phase transformations and
high-pressure behavior. Here, we have carried out an in situ X-ray
diffraction study of laser-shocked poly- and single-crystal forsterite
(a-, b-, and c- orientations) from 19 to 122 GPa using the Matter in
Extreme Conditions end-station of the Linac Coherent Light Source. Under
laser-based shock loading, forsterite does not transform to the
high-pressure equilibrium assemblage of MgSiO3 bridgmanite and MgO
periclase, as was suggested previously. Instead, we observe forsterite and
forsterite III, a metastable polymorph of Mg2SiO4, coexisting in a
mixed-phase region from 33 to 75 GPa for both polycrystalline and
single-crystal samples. Densities inferred from X-ray diffraction data are
consistent with earlier gas-gun shock data. At higher stress, the behavior
observed is sample-dependent. Polycrystalline samples undergo
amorphization above 79 GPa. For [010]- and [001]-oriented crystals, a
mixture of crystalline and amorphous material is observed to 108 GPa,
whereas the [100]-oriented crystal adopts an unknown crystal structure at
122 GPa. The Q values of the first two sharp diffraction peaks of
amorphous Mg2SiO4 show a similar trend with compression as those observed
for MgSiO3 glass in both recent static and laser-compression experiments.
Upon release to ambient pressure, all samples retain or revert to
forsterite with evidence for amorphous material also present in some
cases. This study demonstrates the utility of femtosecond free-electron
laser X-ray sources for probing the time evolution of high-pressure
silicates through the nanosecond-scale events of shock compression and
release.
</description>
</descriptions>
</resource>
2 changes: 1 addition & 1 deletion spec/system/data_migration/femtosecond_form_submission_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
# # This will allow us to evolve our local datacite standards and test our records against them.
datacite = PDCSerialization::Datacite.new_from_work(femtosecond_work)
expect(datacite.valid?).to eq true
# expect(datacite.to_xml).to be_equivalent_to(File.read("spec/system/data_migration/femtosecond.xml"))
expect(datacite.to_xml).to be_equivalent_to(File.read("spec/system/data_migration/femtosecond.xml"))
export_spec_data("femtosecond.json", femtosecond_work.to_json)
end
end
Expand Down
22 changes: 11 additions & 11 deletions spec/system/data_migration/sowingseeds.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,20 @@
populations to assess the usability of Archive-It, a web archiving
subscription service of the Internet Archive. While Archive-It is the most
widely-used tool for web archiving, little is known about how users
interact with the service.This study intended to teach us what users
interact with the service. This study intended to teach us what users
expect from web archives, which exist as another form of archival
material. End-user subjects executed four search tasks using the public
Archive-It interface and the Wayback Machine to access archived
information on websites from the facilitators’ own harvested collections
and provide feedback about their experiences. The tasks were designed to
have straightforward pass or fail outcomes, and the facilitators took
notes on the subjects’ behavior and commentary during the
sessions.Overall, participants reported mildly positive impressions of
Archive-It public user interface based on their session. The study
identified several key areas of improvement for the Archive-It service
pertaining to metadata options, terminology display, indexing of dates,
and the site’s search box. Download the README.txt for a detailed
description of this dataset&apos;s content.
information on websites from the facilitators&apos; own harvested
collections and provide feedback about their experiences. The tasks were
designed to have straightforward pass or fail outcomes, and the
facilitators took notes on the subjects&apos; behavior and commentary
during the sessions. Overall, participants reported mildly positive
impressions of Archive-It public user interface based on their session.
The study identified several key areas of improvement for the Archive-It
service pertaining to metadata options, terminology display, indexing of
dates, and the site&apos;s search box. Download the README.txt for a
detailed description of this dataset&apos;s content.
</description>
</descriptions>
</resource>
6 changes: 3 additions & 3 deletions spec/system/data_migration/sowingseeds_form_submission_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
let(:user) { FactoryBot.create(:research_data_moderator) }
let(:title) { "Sowing the Seeds for More Usable Web Archives: A Usability Study of Archive-It" }
let(:description) do
"In 2017, seven members of the Archive-It Mid-Atlantic Users Group (AITMA) conducted a study of 14 subjects representative of their stakeholder populations to assess the usability of Archive-It, a web archiving subscription service of the Internet Archive. While Archive-It is the most widely-used tool for web archiving, little is known about how users interact with the service.This study intended to teach us what users expect from web archives, which exist as another form of archival material. End-user subjects executed four search tasks using the public Archive-It interface and the Wayback Machine to access archived information on websites from the facilitators’ own harvested collections and provide feedback about their experiences. The tasks were designed to have straightforward pass or fail outcomes,
and the facilitators took notes on the subjects’ behavior and commentary during the sessions.Overall, participants reported mildly positive impressions of Archive-It public user interface based on their session. The study identified several key areas of improvement for the Archive-It service pertaining to metadata options, terminology display, indexing of dates, and the site’s search box.
"In 2017, seven members of the Archive-It Mid-Atlantic Users Group (AITMA) conducted a study of 14 subjects representative of their stakeholder populations to assess the usability of Archive-It, a web archiving subscription service of the Internet Archive. While Archive-It is the most widely-used tool for web archiving, little is known about how users interact with the service. This study intended to teach us what users expect from web archives, which exist as another form of archival material. End-user subjects executed four search tasks using the public Archive-It interface and the Wayback Machine to access archived information on websites from the facilitators' own harvested collections and provide feedback about their experiences. The tasks were designed to have straightforward pass or fail outcomes,
and the facilitators took notes on the subjects' behavior and commentary during the sessions. Overall, participants reported mildly positive impressions of Archive-It public user interface based on their session. The study identified several key areas of improvement for the Archive-It service pertaining to metadata options, terminology display, indexing of dates, and the site's search box.
Download the README.txt for a detailed description of this dataset's content."
Download the README.txt for a detailed description of this dataset's content."
end
let(:ark) { "ark:/88435/dsp01d791sj97j" }
let(:collection) { "Research Data" }
Expand Down
5 changes: 4 additions & 1 deletion spec/system/work_edit_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,10 @@
click_on "Additional Metadata"
find(:xpath, "(//i[@class='bi bi-trash btn-del-row'])[1]").click
click_on "Save Work"
expect(page).not_to have_content("National Science Foundation")
work.reload
funders = work.resource.funders.map(&:funder_name)
# Can't check for absence of "National Science Foundation" on the page bc it exists in the changelog
expect(funders).to contain_exactly("National Sigh, Hence Foundation")
expect(page).to have_content("National Sigh, Hence Foundation")

# Test row reordering
Expand Down

0 comments on commit bda675c

Please sign in to comment.