Skip to content

Commit

Permalink
Merge pull request #27 from zeplin/v1-bugfix
Browse files Browse the repository at this point in the history
Bugfix for v1.0.x
  • Loading branch information
dirtybit authored Apr 13, 2020
2 parents 573233b + e77c1e9 commit c1dbc3e
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 188 deletions.
7 changes: 6 additions & 1 deletion src/template/src/fixtures/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ import project from "./project.json";
import screensData from "./screens.json";
import componentsData from "./components.json";
import versionData from "./version.json";
import { zeplin } from "../../package.json";

const defaultOptions = zeplin.options.reduce((options, option) => {
options[option.id] = option.default;
return options;
}, {});

export const context = new Context({ project, options: {} });
export const context = new Context({ project, options: defaultOptions });
export const version = new Version(versionData);
export const screens = screensData.map(data => new Screen(data));
export const components = componentsData.map(data => new Component(data));
180 changes: 36 additions & 144 deletions src/template/src/fixtures/version.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,6 @@
{
"fillType": "color",
"blendMode": "normal",
"fill": {
"r": 0,
"g": 255,
"b": 255,
"a": 1
},
"color": {
"r": 0,
"g": 255,
Expand Down Expand Up @@ -228,12 +222,6 @@
{
"fillType": "color",
"blendMode": "normal",
"fill": {
"r": 255,
"g": 255,
"b": 0,
"a": 1
},
"color": {
"r": 255,
"g": 255,
Expand Down Expand Up @@ -266,12 +254,6 @@
{
"fillType": "color",
"blendMode": "normal",
"fill": {
"r": 255,
"g": 0,
"b": 0,
"a": 1
},
"color": {
"r": 255,
"g": 0,
Expand Down Expand Up @@ -304,12 +286,6 @@
{
"fillType": "color",
"blendMode": "normal",
"fill": {
"r": 0,
"g": 255,
"b": 0,
"a": 1
},
"color": {
"r": 0,
"g": 255,
Expand Down Expand Up @@ -342,12 +318,6 @@
{
"fillType": "color",
"blendMode": "normal",
"fill": {
"r": 0,
"g": 255,
"b": 0,
"a": 1
},
"color": {
"r": 0,
"g": 255,
Expand Down Expand Up @@ -415,37 +385,6 @@
{
"fillType": "gradient",
"blendMode": "normal",
"fill": {
"type": "linear",
"from": {
"x": 0.5,
"y": 0
},
"to": {
"x": 0.5,
"y": 1
},
"colorStops": [
{
"color": {
"r": 255,
"g": 255,
"b": 255,
"a": 0.5
},
"position": 0
},
{
"color": {
"r": 0,
"g": 0,
"b": 0,
"a": 0.5
},
"position": 1
}
]
},
"gradient": {
"type": "linear",
"from": {
Expand Down Expand Up @@ -503,12 +442,6 @@
{
"fillType": "color",
"blendMode": "normal",
"fill": {
"r": 0,
"g": 0,
"b": 255,
"a": 1
},
"color": {
"r": 0,
"g": 0,
Expand Down Expand Up @@ -540,71 +473,38 @@
{
"position": "outside",
"thickness": 6,
"fill": {
"type": "gradient",
"blendMode": "normal",
"fill": {
"type": "radial",
"from": {
"x": 0.5,
"y": 0
},
"to": {
"x": 0.5,
"y": 1
},
"colorStops": [
{
"color": {
"r": 255,
"g": 0,
"b": 0,
"a": 1
},
"position": 0
},
{
"color": {
"r": 255,
"g": 0,
"b": 0,
"a": 0
},
"position": 1
}
]
"fillType": "gradient",
"blendMode": "normal",
"gradient": {
"type": "radial",
"from": {
"x": 0.5,
"y": 0
},
"gradient": {
"type": "radial",
"from": {
"x": 0.5,
"y": 0
},
"to": {
"x": 0.5,
"y": 1
"to": {
"x": 0.5,
"y": 1
},
"colorStops": [
{
"color": {
"r": 255,
"g": 0,
"b": 0,
"a": 1
},
"position": 0
},
"colorStops": [
{
"color": {
"r": 255,
"g": 0,
"b": 0,
"a": 1
},
"position": 0
{
"color": {
"r": 255,
"g": 0,
"b": 0,
"a": 0
},
{
"color": {
"r": 255,
"g": 0,
"b": 0,
"a": 0
},
"position": 1
}
]
}
"position": 1
}
]
}
}
],
Expand Down Expand Up @@ -632,21 +532,13 @@
{
"position": "inside",
"thickness": 2,
"fill": {
"type": "color",
"blendMode": "normal",
"fill": {
"r": 0,
"g": 0,
"b": 0,
"a": 1
},
"color": {
"r": 0,
"g": 0,
"b": 0,
"a": 1
}
"fillType": "color",
"blendMode": "normal",
"color": {
"r": 0,
"g": 0,
"b": 0,
"a": 1
}
}
],
Expand Down
86 changes: 43 additions & 43 deletions src/template/src/index.test.js
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
import extension from './index';
import extension from "./index";
import { context, version, screens, components } from "./fixtures";


describe('Colors', () => {
it('should generate code snippet', () => {
const code = extension.colors(context);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});
describe("Colors", () => {
it("should generate code snippet", () => {
const code = extension.colors(context);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});

it('should generate exportable file', () => {
const code = extension.exportColors(context);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});
it("should generate exportable file", () => {
const code = extension.exportColors(context);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});
});


describe('Text Styles', () => {
it('should generate code snippet', () => {
const code = extension.textStyles(context);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});
describe("Text Styles", () => {
it("should generate code snippet", () => {
const code = extension.textStyles(context);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});

it('should generate exportable file', () => {
const code = extension.exportTextStyles(context);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});
it("should generate exportable file", () => {
const code = extension.exportTextStyles(context);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});
});


describe('Spacing', () => {
it('should generate code snippet', () => {
const code = extension.spacing(context);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});
describe("Spacing", () => {
it("should generate code snippet", () => {
const code = extension.spacing(context);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});

it('should generate exportable file', () => {
const code = extension.exportSpacing(context);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});
it("should generate exportable file", () => {
const code = extension.exportSpacing(context);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});
});


version.layers.map(layer => {
describe(`Layer \`${layer.name}\``, () => {
it('should generate code snippet', async () => {
const code = extension.layer(context, layer, version);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
describe(`Layer \`${layer.name}\``, () => {
it("should generate code snippet", async () => {
const code = extension.layer(context, layer, version);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});
});
});
});


screens.map(screen => {
describe(`Screen \`${screen.name}\``, () => {
it('should generate code snippet', async () => {
const code = extension.screen(context, version, screen);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
describe(`Screen \`${screen.name}\``, () => {
it("should generate code snippet", async () => {
const code = extension.screen(context, version, screen);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});
});
});
});


components.map(component => {
describe(`Component \`${component.name}\``, () => {
it('should generate code snippet', async () => {
const code = extension.component(context, version, component);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
describe(`Component \`${component.name}\``, () => {
it("should generate code snippet", async () => {
const code = extension.component(context, version, component);
return expect(Promise.resolve(code)).resolves.toMatchSnapshot();
});
});
});
});

0 comments on commit c1dbc3e

Please sign in to comment.