Skip to content
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

Fix line number type #491

Merged
merged 2 commits into from
Aug 1, 2018
Merged

Fix line number type #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de2dd6a
Convert line number to integer
Aug 1, 2018
cae89c5
Rename test variable
Aug 1, 2018
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
8 changes: 4 additions & 4 deletions packages/blob-reader/__snapshots__/test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@

exports[`blob-reader blob 1st line 1`] = `
Object {
"lineNumber": "1",
"lineNumber": 1,
"value": "// Most popular rabbit names",
}
`;

exports[`blob-reader blob 2nd line 1`] = `
Object {
"lineNumber": "2",
"lineNumber": 2,
"value": "",
}
`;

exports[`blob-reader blob 3rd line 1`] = `
Object {
"lineNumber": "3",
"lineNumber": 3,
"value": "Thumper",
}
`;

exports[`blob-reader blob 4th line 1`] = `
Object {
"lineNumber": "4",
"lineNumber": 4,
"value": "Daisy",
}
`;
Expand Down
2 changes: 1 addition & 1 deletion packages/blob-reader/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function getLineNumber(el) {
if (el.id) {
const result = /^LC?([0-9]+)$/.exec(el.id);
if (result && result[1]) {
return result[1];
return parseInt(result[1], 10);
}
}

Expand Down
84 changes: 44 additions & 40 deletions packages/blob-reader/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ describe('blob-reader', () => {
});

describe('returned values object', () => {
let result;
let blob;

beforeEach(() => {
fixture.load(
'/packages/blob-reader/fixtures/github.com/blob/89f13651df126efdb4f1e3ae40183c9fdccdb4d3.html',
);
const reader = new BlobReader();
[result] = reader.read()._blobs;
[blob] = reader.read()._blobs;
});

describe('contains blob path', () => {
it('contains blob path', () => {
expect(result.path).toBe(
expect(blob.path).toBe(
'/OctoLinker/testrepo/blob/89f13651df126efdb4f1e3ae40183c9fdccdb4d3/sourcereader/popular-rabbit-names.js',
);
});
Expand Down Expand Up @@ -58,166 +58,170 @@ describe('blob-reader', () => {
});

it('contains blob root element', () => {
expect(result.el).toBeDefined();
expect(blob.el).toBeDefined();
});

it('contains lines', () => {
expect(Array.isArray(result.lines)).toBe(true);
expect(result.lines).toHaveLength(4);
expect(Array.isArray(blob.lines)).toBe(true);
expect(blob.lines).toHaveLength(4);
});

describe('toString()', () => {
it('returns a string representation of the blobs content', () => {
result.lines = [{ value: 'a' }, { value: 'b' }];
expect(result.toString()).toMatchSnapshot();
blob.lines = [{ value: 'a' }, { value: 'b' }];
expect(blob.toString()).toMatchSnapshot();
});
});

describe('toJSON()', () => {
it('returns a JSON representation of the blobs content', () => {
result.lines = [
blob.lines = [
{ value: '{' },
{ value: '"foo": "bar"' },
{ value: '}' },
];
expect(result.toJSON()).toMatchSnapshot();
expect(blob.toJSON()).toMatchSnapshot();
});

it('returns an empty object if JSON.parse fails', () => {
result.lines = [{ value: '{' }, { value: 'invalid' }, { value: '}' }];
expect(result.toJSON()).toEqual({});
blob.lines = [{ value: '{' }, { value: 'invalid' }, { value: '}' }];
expect(blob.toJSON()).toEqual({});
});
});
});

describe('blob', () => {
let result;
let blob;

beforeEach(() => {
fixture.load(
'/packages/blob-reader/fixtures/github.com/blob/89f13651df126efdb4f1e3ae40183c9fdccdb4d3.html',
);
const reader = new BlobReader();
[result] = reader.read()._blobs;
[blob] = reader.read()._blobs;
});

it('contains four lines', () => {
expect(Array.isArray(result.lines)).toBe(true);
expect(result.lines).toHaveLength(4);
expect(Array.isArray(blob.lines)).toBe(true);
expect(blob.lines).toHaveLength(4);
});

it('does not contain any diff meta information', () => {
expect(
result.lines.filter(line => line.additions || line.deletions),
blob.lines.filter(line => line.addition || line.deletion),
).toHaveLength(0);
});

it('sets isDiff indicator to false', () => {
expect(blob.isDiff).toBeFalsy();
});

it('1st line', () => {
expect(result.lines[0]).toMatchSnapshot();
expect(blob.lines[0]).toMatchSnapshot();
});

it('2nd line', () => {
expect(result.lines[1]).toMatchSnapshot();
expect(blob.lines[1]).toMatchSnapshot();
});

it('3rd line', () => {
expect(result.lines[2]).toMatchSnapshot();
expect(blob.lines[2]).toMatchSnapshot();
});

it('4th line', () => {
expect(result.lines[3]).toMatchSnapshot();
expect(blob.lines[3]).toMatchSnapshot();
});
});

describe('diff', () => {
describe('split', () => {
let result;
let blob;

beforeEach(() => {
fixture.load(
'/packages/blob-reader/fixtures/github.com/commit/b0775a93ea27ee381858ddd9fa2bb953d5b74acb_split.html',
);
const reader = new BlobReader();
[result] = reader.read()._blobs;
[blob] = reader.read()._blobs;
});

it('1st line', () => {
expect(result.lines[0]).toMatchSnapshot();
expect(blob.lines[0]).toMatchSnapshot();
});

it('additions', () => {
expect(result.lines[6]).toMatchSnapshot();
expect(blob.lines[6]).toMatchSnapshot();
});

it('deletions', () => {
expect(result.lines[9]).toMatchSnapshot();
expect(blob.lines[9]).toMatchSnapshot();
});
});

describe('unified', () => {
let result;
let blob;

beforeEach(() => {
fixture.load(
'/packages/blob-reader/fixtures/github.com/commit/b0775a93ea27ee381858ddd9fa2bb953d5b74acb_unified.html',
);
const reader = new BlobReader();
[result] = reader.read()._blobs;
[blob] = reader.read()._blobs;
});

it('contains four lines', () => {
expect(result.lines).toHaveLength(7);
expect(blob.lines).toHaveLength(7);
});

it('1st line', () => {
expect(result.lines[0]).toMatchSnapshot();
expect(blob.lines[0]).toMatchSnapshot();
});

it('additions', () => {
expect(result.lines[3]).toMatchSnapshot();
expect(blob.lines[3]).toMatchSnapshot();
});

it('deletions', () => {
expect(result.lines[5]).toMatchSnapshot();
expect(blob.lines[5]).toMatchSnapshot();
});
});
});

describe('gist', () => {
let result;
let blob;

beforeEach(() => {
fixture.load(
'/packages/blob-reader/fixtures/github.com/gist/113827963013e98c6196db51cd889c39.html',
);
const reader = new BlobReader();
[result] = reader.read()._blobs;
[blob] = reader.read()._blobs;
});

it('contains blob path', () => {
expect(result.path).toBe('package.json');
expect(blob.path).toBe('package.json');
});
});

describe('issue', () => {
let result;
let blob;

beforeEach(() => {
fixture.load('/packages/blob-reader/fixtures/github.com/issue/code.html');
const reader = new BlobReader();
[result] = reader.read()._blobs;
[blob] = reader.read()._blobs;
});

it('contains blob root element', () => {
expect(result.el).toBeDefined();
expect(blob.el).toBeDefined();
});

it('contains lines', () => {
expect(result.lines).toMatchSnapshot();
expect(blob.lines).toMatchSnapshot();
});

it('does not contain path', () => {
expect(result.path).toBeUndefined();
expect(blob.path).toBeUndefined();
});
});
});