From d2d5966ee1ea8534745b7b73024feae10dfeff5a Mon Sep 17 00:00:00 2001 From: joshaber Date: Thu, 7 Jan 2016 16:37:05 -0500 Subject: [PATCH] More tests for the submodule cases. --- .../You-Dont-Need-jQuery/README.md | 1 + .../You-Dont-Need-jQuery/COMMIT_EDITMSG | 9 +++++ .../modules/You-Dont-Need-jQuery/index | Bin 1919 -> 1919 bytes .../modules/You-Dont-Need-jQuery/logs/HEAD | 1 + .../logs/refs/heads/master | 1 + .../a7/8b35a896b890f0a2a4f1f924c5739776415250 | 2 ++ .../ae/897dce6e0590f08dddfe9a5152e237e955ca57 | Bin 0 -> 8484 bytes .../be/8ed228c0a080145d28ed625a5f487caae6a3f9 | Bin 0 -> 602 bytes .../You-Dont-Need-jQuery/refs/heads/master | 2 +- .../git.git/modules/jstips/COMMIT_EDITMSG | 7 ++++ .../git.git/modules/jstips/HEAD | 2 +- .../git.git/modules/jstips/index | Bin 427 -> 427 bytes .../git.git/modules/jstips/logs/HEAD | 2 ++ .../modules/jstips/logs/refs/heads/test | 2 ++ .../05/25ef667328cb1f86b1ddf523db4a064e1590fa | 2 ++ .../1a/dd860234dad4a8bf59340363e9c88bb0457cb7 | Bin 0 -> 5663 bytes .../5b/35953562dbb4f2debe88fcc9ac1805064e1e5a | Bin 0 -> 127 bytes .../git.git/modules/jstips/refs/heads/test | 1 + .../git/repo-with-submodules/jstips/README.md | 5 +-- spec/git-repository-async-spec.js | 32 +++++++++++++++++- 20 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/COMMIT_EDITMSG create mode 100644 spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/objects/a7/8b35a896b890f0a2a4f1f924c5739776415250 create mode 100644 spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/objects/ae/897dce6e0590f08dddfe9a5152e237e955ca57 create mode 100644 spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/objects/be/8ed228c0a080145d28ed625a5f487caae6a3f9 create mode 100644 spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/COMMIT_EDITMSG create mode 100644 spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/logs/refs/heads/test create mode 100644 spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/objects/05/25ef667328cb1f86b1ddf523db4a064e1590fa create mode 100644 spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/objects/1a/dd860234dad4a8bf59340363e9c88bb0457cb7 create mode 100644 spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/objects/5b/35953562dbb4f2debe88fcc9ac1805064e1e5a create mode 100644 spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/refs/heads/test diff --git a/spec/fixtures/git/repo-with-submodules/You-Dont-Need-jQuery/README.md b/spec/fixtures/git/repo-with-submodules/You-Dont-Need-jQuery/README.md index 6476f5034..ae897dce6 100644 --- a/spec/fixtures/git/repo-with-submodules/You-Dont-Need-jQuery/README.md +++ b/spec/fixtures/git/repo-with-submodules/You-Dont-Need-jQuery/README.md @@ -2,6 +2,7 @@ Frontend environments evolve rapidly nowadays, modern browsers have already implemented a great deal of DOM/BOM APIs which are good enough. We don't have to learn jQuery from scratch for DOM manipulation or events. In the meantime, thanks to the prevailment of frontend libraries such as React, Angular and Vue, manipulating DOM directly becomes anti-pattern, jQuery has never been less important. This project summarizes most of the jQuery method alternatives in native implementation, with IE 10+ support. + ## Table of Contents 1. [Query Selector](#query-selector) diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/COMMIT_EDITMSG b/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/COMMIT_EDITMSG new file mode 100644 index 000000000..2ce36ac82 --- /dev/null +++ b/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/COMMIT_EDITMSG @@ -0,0 +1,9 @@ +whitespace is nicespace +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# On branch master +# Your branch is up-to-date with 'origin/master'. +# +# Changes to be committed: +# modified: README.md +# diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/index b/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/index index 202c1f9ceb11e5e0d6143722d77602bbb12dd012..af63d76e50368defe1cc52f521bf6676371a67be 100644 GIT binary patch delta 95 zcmV-l0HFW>4*w3Y1_TP)1^@s609KCL29pp38x^^(iG9v)1(5KK-Ts 1452186236 -0500 clone: from https://github.com/oneuijs/You-Dont-Need-jQuery +2e9bbc77d60f20eb462ead5b2ac7405b62b9b90a a78b35a896b890f0a2a4f1f924c5739776415250 joshaber 1452202510 -0500 commit: whitespace is nicespace diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/logs/refs/heads/master b/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/logs/refs/heads/master index a76a6d29f..8b2542f26 100644 --- a/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/logs/refs/heads/master +++ b/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/logs/refs/heads/master @@ -1 +1,2 @@ 0000000000000000000000000000000000000000 2e9bbc77d60f20eb462ead5b2ac7405b62b9b90a joshaber 1452186236 -0500 clone: from https://github.com/oneuijs/You-Dont-Need-jQuery +2e9bbc77d60f20eb462ead5b2ac7405b62b9b90a a78b35a896b890f0a2a4f1f924c5739776415250 joshaber 1452202510 -0500 commit: whitespace is nicespace diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/objects/a7/8b35a896b890f0a2a4f1f924c5739776415250 b/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/objects/a7/8b35a896b890f0a2a4f1f924c5739776415250 new file mode 100644 index 000000000..756c94ceb --- /dev/null +++ b/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/objects/a7/8b35a896b890f0a2a4f1f924c5739776415250 @@ -0,0 +1,2 @@ +xQ +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 literal 0 HcmV?d00001 diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/refs/heads/master b/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/refs/heads/master index b7cdcfd53..d55f75b7c 100644 --- a/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/refs/heads/master +++ b/spec/fixtures/git/repo-with-submodules/git.git/modules/You-Dont-Need-jQuery/refs/heads/master @@ -1 +1 @@ -2e9bbc77d60f20eb462ead5b2ac7405b62b9b90a +a78b35a896b890f0a2a4f1f924c5739776415250 diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/COMMIT_EDITMSG b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/COMMIT_EDITMSG new file mode 100644 index 000000000..27b8ad2f6 --- /dev/null +++ b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/COMMIT_EDITMSG @@ -0,0 +1,7 @@ +whitespace is nicespace +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# On branch test +# Changes to be committed: +# modified: README.md +# diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/HEAD b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/HEAD index cb089cd89..cea9d05ed 100644 --- a/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/HEAD +++ b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/HEAD @@ -1 +1 @@ -ref: refs/heads/master +ref: refs/heads/test diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/index b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/index index 1286686f0e88eea81a061b1c4db4db3a0247c65e..bb4608687ebd0cbc38f4b6f45673d3a1fa2dee2a 100644 GIT binary patch delta 114 zcmZ3@yqbAJoYnQo3_uXp2ca1m7+BaPHf(2LXk5a;!1xs?CBnd9A|rLTjmhNJl@(uM2sWDSAJ3d;cA(G Ocu%TiAm3!C=6V1aaw!4; diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/logs/HEAD b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/logs/HEAD index e87df8417..4dc0ab455 100644 --- a/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/logs/HEAD +++ b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/logs/HEAD @@ -1 +1,3 @@ 0000000000000000000000000000000000000000 9f0218b7652b622afea799a4723490c43e1af1fe joshaber 1452186187 -0500 clone: from https://github.com/loverajoel/jstips +9f0218b7652b622afea799a4723490c43e1af1fe 9f0218b7652b622afea799a4723490c43e1af1fe joshaber 1452201852 -0500 checkout: moving from master to test +9f0218b7652b622afea799a4723490c43e1af1fe 0525ef667328cb1f86b1ddf523db4a064e1590fa joshaber 1452201881 -0500 commit: whitespace is nicespace diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/logs/refs/heads/test b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/logs/refs/heads/test new file mode 100644 index 000000000..97fc9fe1a --- /dev/null +++ b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/logs/refs/heads/test @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 9f0218b7652b622afea799a4723490c43e1af1fe joshaber 1452201852 -0500 branch: Created from HEAD +9f0218b7652b622afea799a4723490c43e1af1fe 0525ef667328cb1f86b1ddf523db4a064e1590fa joshaber 1452201881 -0500 commit: whitespace is nicespace diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/objects/05/25ef667328cb1f86b1ddf523db4a064e1590fa b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/objects/05/25ef667328cb1f86b1ddf523db4a064e1590fa new file mode 100644 index 000000000..453565277 --- /dev/null +++ b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/objects/05/25ef667328cb1f86b1ddf523db4a064e1590fa @@ -0,0 +1,2 @@ +x] }{ ,?bliZחݷ7IuK6fQ`u8h2RVlI dY2 2͊,ݦEzc:@( +}K{gQ|x_)1~F|QBI \ No newline at end of file diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/objects/1a/dd860234dad4a8bf59340363e9c88bb0457cb7 b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/objects/1a/dd860234dad4a8bf59340363e9c88bb0457cb7 new file mode 100644 index 0000000000000000000000000000000000000000..e523c5ae201bf0a4f22e33a12d0fe8f8c0ef8850 GIT binary patch literal 5663 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 F`KkV&DK-EA literal 0 HcmV?d00001 diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/objects/5b/35953562dbb4f2debe88fcc9ac1805064e1e5a b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/objects/5b/35953562dbb4f2debe88fcc9ac1805064e1e5a new file mode 100644 index 0000000000000000000000000000000000000000..3065a654f525d6bc51ed6b4dba0a41afe486140d GIT binary patch literal 127 zcmV-_0D%8^0V^p=O;s>7G-EI{FfcPQQE>M63kmXc3Jvk}bJxpFVR-V{u0>tu40~6I z!rYBVmE9k2WIhU28szHe;_C`hBz3oq$>i3R75gJin3G?g=-%L3v)#l12o#D^i}Op1 hl2eNra=QZed2W9H)L@T@vL_Eq;JNr2Z2)PUEzM;!Jo5km literal 0 HcmV?d00001 diff --git a/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/refs/heads/test b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/refs/heads/test new file mode 100644 index 000000000..71704a9f7 --- /dev/null +++ b/spec/fixtures/git/repo-with-submodules/git.git/modules/jstips/refs/heads/test @@ -0,0 +1 @@ +0525ef667328cb1f86b1ddf523db4a064e1590fa diff --git a/spec/fixtures/git/repo-with-submodules/jstips/README.md b/spec/fixtures/git/repo-with-submodules/jstips/README.md index dfdb3a5f9..1add86023 100644 --- a/spec/fixtures/git/repo-with-submodules/jstips/README.md +++ b/spec/fixtures/git/repo-with-submodules/jstips/README.md @@ -1,5 +1,6 @@ ![header](https://raw.githubusercontent.com/loverajoel/jstips/master/resources/jstips-header-blog.gif) + # Introducing Javascript Tips > New year, new project. **A JS tip per day!** @@ -28,7 +29,7 @@ You just have to concat everything into an array first. `Array.concat` will acce ```javascript function printUpperCase(words) { - var elements = [].concat(words); + var elements = [].concat(words); for (var i = 0; i < elements.length; i++) { console.log(elements[i].toUpperCase()); } @@ -38,7 +39,7 @@ function printUpperCase(words) { `printUpperCase` is now ready to accept a single node or an array of nodes as it's parameter. ```javascript -printUpperCase("cactus"); +printUpperCase("cactus"); // => CACTUS printUpperCase(["cactus", "bear", "potato"]); // => CACTUS diff --git a/spec/git-repository-async-spec.js b/spec/git-repository-async-spec.js index e6084e6ad..039ed66e6 100644 --- a/spec/git-repository-async-spec.js +++ b/spec/git-repository-async-spec.js @@ -552,6 +552,20 @@ describe('GitRepositoryAsync', () => { const head = await repo.getShortHead() expect(head).toBe('master') }) + + describe('in a submodule', () => { + beforeEach(() => { + const workingDirectory = copySubmoduleRepository() + repo = GitRepositoryAsync.open(workingDirectory) + }) + + it('returns the human-readable branch name', async () => { + await repo.refreshStatus() + + const head = await repo.getShortHead('jstips') + expect(head).toBe('test') + }) + }) }) describe('.getAheadBehindCount(reference, path)', () => { @@ -575,10 +589,26 @@ describe('GitRepositoryAsync', () => { it('returns 0, 0 for a branch with no upstream', async () => { await repo.refreshStatus() - const {ahead, behind} = repo.getCachedUpstreamAheadBehindCount() + + const {ahead, behind} = await repo.getCachedUpstreamAheadBehindCount() expect(ahead).toBe(0) expect(behind).toBe(0) }) + + describe('in a submodule', () => { + beforeEach(() => { + const workingDirectory = copySubmoduleRepository() + repo = GitRepositoryAsync.open(workingDirectory) + }) + + it('returns 0, 0 for a branch with no upstream', async () => { + await repo.refreshStatus() + + const {ahead, behind} = await repo.getCachedUpstreamAheadBehindCount('You-Dont-Need-jQuery') + expect(ahead).toBe(1) + expect(behind).toBe(0) + }) + }) }) describe('.getDiffStats(path)', () => {