Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/klembot/twinejs
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Klimas committed Apr 14, 2019
2 parents 1202f7a + f8cdaaa commit f344e66
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/data/actions/story-format.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ const actions = module.exports = {
},
{
name: 'Harlowe',
url: 'story-formats/harlowe-3.0.0/format.js',
version: '3.0.0',
url: 'story-formats/harlowe-3.0.1/format.js',
version: '3.0.1',
userAdded: false
},
{
Expand Down Expand Up @@ -229,7 +229,7 @@ const actions = module.exports = {
setPref(
store,
'defaultFormat',
{ name: 'Harlowe', version: '3.0.0' }
{ name: 'Harlowe', version: '3.0.1' }
);
}

Expand Down
8 changes: 4 additions & 4 deletions src/data/actions/story-format.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ describe('story format actions module', () => {
}
}

expect(created['Harlowe-3.0.0']).to.exist;
expect(created['Harlowe-3.0.0'].url).to.equal('story-formats/harlowe-3.0.0/format.js');
expect(created['Harlowe-3.0.0'].userAdded).to.be.false;
expect(created['Harlowe-3.0.1']).to.exist;
expect(created['Harlowe-3.0.1'].url).to.equal('story-formats/harlowe-3.0.1/format.js');
expect(created['Harlowe-3.0.1'].userAdded).to.be.false;
expect(created['Harlowe-2.1.0']).to.exist;
expect(created['Harlowe-2.1.0'].url).to.equal('story-formats/harlowe-2.1.0/format.js');
expect(created['Harlowe-2.1.0'].userAdded).to.be.false;
Expand Down Expand Up @@ -130,7 +130,7 @@ describe('story format actions module', () => {
storyFormat: {
formats: [
{ name: 'Harlowe', version: '2.0.1' },
{ name: 'Harlowe', version: '3.0.0' },
{ name: 'Harlowe', version: '3.0.1' },
{ name: 'Paperthin', version: '1.0.0' },
{ name: 'Snowman', version: '1.3.0' },
{ name: 'SugarCube', version: '1.0.35' },
Expand Down

Large diffs are not rendered by default.

File renamed without changes

0 comments on commit f344e66

Please sign in to comment.