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.

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

merkleId Identity submodule submission #5577

Merged
merged 27 commits into from
Aug 28, 2020
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f54ba0e
Create merkleIdSystem.js
angelamerkelprebid Aug 6, 2020
926a1e3
Update userId_example.html
angelamerkelprebid Aug 6, 2020
c0b439e
Update eids.md
angelamerkelprebid Aug 6, 2020
07c7f80
Update userId_spec.js
angelamerkelprebid Aug 6, 2020
c2fae2a
Merge pull request #1 from angelamerkelprebid/angelamerkelprebid-merk…
angelamerkelprebid Aug 6, 2020
c4200e7
Update eids.md
angelamerkelprebid Aug 6, 2020
3442c40
fix string break in gdpr applies warning
angelamerkelprebid Aug 6, 2020
d52d905
Update merkleIdSystem.js
angelamerkelprebid Aug 6, 2020
c4ca3fd
Update merkleIdSystem.js
angelamerkelprebid Aug 6, 2020
97612d4
Update userId_spec.js
angelamerkelprebid Aug 6, 2020
52bbc3f
Update merkleIdSystem.js
angelamerkelprebid Aug 6, 2020
ad4a3c3
Update merkleIdSystem.js
angelamerkelprebid Aug 6, 2020
bd28075
Update userId_spec.js
angelamerkelprebid Aug 6, 2020
ee4799e
Update userId_spec.js
angelamerkelprebid Aug 6, 2020
650585f
Update eids_spec.js
angelamerkelprebid Aug 6, 2020
6cae0ae
Update eids_spec.js
angelamerkelprebid Aug 6, 2020
c40bc70
Update merkleIdSystem.js
angelamerkelprebid Aug 6, 2020
1e21a66
Update merkleIdSystem.js
angelamerkelprebid Aug 6, 2020
a5603cb
Update merkleIdSystem.js
angelamerkelprebid Aug 6, 2020
b9c9062
Merge pull request #2 from prebid/master
angelamerkelprebid Aug 23, 2020
c35e984
Update merkleIdSystem.js
angelamerkelprebid Aug 23, 2020
7d22cd4
Update merkleIdSystem.js
angelamerkelprebid Aug 23, 2020
06167c7
Update .submodules.json
angelamerkelprebid Aug 23, 2020
c29aa86
Update eids.js
angelamerkelprebid Aug 24, 2020
2844014
Update eids_spec.js
angelamerkelprebid Aug 24, 2020
0d523d8
Update eids.js
angelamerkelprebid Aug 24, 2020
d6f1527
Merge pull request #3 from prebid/master
angelamerkelprebid Aug 24, 2020
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
Prev Previous commit
Next Next commit
Update eids_spec.js
  • Loading branch information
angelamerkelprebid authored Aug 6, 2020
commit 650585fd1a596d05635287d567c16bef3e7968f0
15 changes: 15 additions & 0 deletions test/spec/modules/eids_spec.js
Original file line number Diff line number Diff line change
@@ -55,6 +55,21 @@ describe('eids array generation for known sub-modules', function() {
});
});

it('merkleId', function() {
const userId = {
merkleId: {
eid: 'some-random-id-value'
angelamerkelprebid marked this conversation as resolved.
Show resolved Hide resolved
}
};
const newEids = createEidsArray(userId);
expect(newEids.length).to.equal(1);
expect(newEids[0]).to.deep.equal({
source: 'merkleinc.com',
uids: [{id: 'some-random-id-value', atype: 1}]
});
});


it('identityLink', function() {
const userId = {
idl_env: 'some-random-id-value'