Skip to content

Commit

Permalink
Merge branch 'develop' into refactor/get-links-count
Browse files Browse the repository at this point in the history
  • Loading branch information
mattyg committed Jul 31, 2023
2 parents 7f1f54b + 8efa20e commit 5741d29
Show file tree
Hide file tree
Showing 16 changed files with 132 additions and 120 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ jobs:
key: ${{ runner.os }}-build-${{ hashFiles('Cargo.lock') }}

- name: Test with tryorama
run: nix develop -c $SHELL -c "npm test"
run: nix develop -c $SHELL -c "npm run test"
2 changes: 1 addition & 1 deletion tests/src/mewsfeed/agent_pins/pinner-to-hashes.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@ test("link a Pinner to a Hash", async () => {
assert.equal(linksOutput.length, 0);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});
6 changes: 3 additions & 3 deletions tests/src/mewsfeed/follows/follower-to-creators.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ test("link a Follower to a Creator", async () => {
assert.equal(linksOutput.length, 0);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -127,7 +127,7 @@ test("Agent cannot follow themselves", async () => {
);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -198,7 +198,7 @@ test("Agent can only change their own follows", async () => {
);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down
4 changes: 2 additions & 2 deletions tests/src/mewsfeed/likes/liker-to-hashes.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ test("link a Liker to a Hash", async () => {
assert.equal(linksOutput.length, 0);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -157,6 +157,6 @@ test("Agent can only change their own likes", async () => {
);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});
4 changes: 2 additions & 2 deletions tests/src/mewsfeed/mews/agent-mews.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ test("create a Mew and get agent mews", async () => {
assert.deepEqual(actionHash, collectionOutput[0].action_hash);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -247,6 +247,6 @@ test("Agent mews list are time-paginated", async () => {
assert.lengthOf(page5, 0);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});
12 changes: 6 additions & 6 deletions tests/src/mewsfeed/mews/agent-to-notifications.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ test("notifications include my agent follows & unfollows", async () => {
expect(count).toEqual(2);
},
true,
{ timeout: 150000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -157,7 +157,7 @@ test("notifications include my mews' likes & unlikes", async () => {
expect(count).toEqual(2);
},
true,
{ timeout: 150000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -238,7 +238,7 @@ test("notifications include my mews' pins & unpins", async () => {
expect(count).toEqual(2);
},
true,
{ timeout: 150000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -350,7 +350,7 @@ test("notifications include my mews' replies, quotes, mewmews", async () => {
expect(count).toEqual(3);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -480,7 +480,7 @@ test("notifications include replies, quotes, mewmews to mews that I also respond
expect(count).toEqual(3);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -750,6 +750,6 @@ test("notifications list is time-paginated", async () => {
assert.lengthOf(page5, 0);
},
true,
{ timeout: 150000 }
{ timeout: 500000 }
);
});
8 changes: 4 additions & 4 deletions tests/src/mewsfeed/mews/dna-properties.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ test("Mew must not be longer than DNA property mew_characters_max chars", async
}
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -103,7 +103,7 @@ test("Mew must not be shorter than DNA property mew_characters_min chars", async
}
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -158,7 +158,7 @@ test("Mew can be any length if DNA property mew_characters_min and mew_character
);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand All @@ -185,6 +185,6 @@ test("Can get deserialized DNA Properties", async () => {
expect(properties).toHaveProperty("mew_characters_max", 200);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});
14 changes: 7 additions & 7 deletions tests/src/mewsfeed/mews/followed-creators-mews.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ test("create a Mew and get followed creators mews", async () => {
assert.deepEqual(actionHash, collectionOutput[0].action_hash);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -116,7 +116,7 @@ test("Followed creators mews should include mews of followed creator", async ()
);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -172,7 +172,7 @@ test("Followed creators mews should include own mews", async () => {
);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -238,7 +238,7 @@ test("Followed creators mews should not include mews of non-followed creator", a
);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -307,7 +307,7 @@ test("Unfollowing should exclude creators mews from feed", async () => {
assert.ok(bobMewsFeed.length === 0, "bob's mews feed is empty");
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -421,7 +421,7 @@ test("Followed creators mews should be ordered by timestamp in descending order"
);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -613,6 +613,6 @@ test("Followed creators mews list are time-paginated", async () => {
assert.lengthOf(page5, 0);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});
4 changes: 2 additions & 2 deletions tests/src/mewsfeed/mews/mention-to-mews.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ test("mention in mews", async () => {
assert.deepEqual(mentionedMewsAlice[0].action_hash, actionHash3);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -265,6 +265,6 @@ test("Mentions list are time-paginated", async () => {
assert.lengthOf(page5, 0);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});
6 changes: 3 additions & 3 deletions tests/src/mewsfeed/mews/mew-to-responses.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ test("Agent can reply to a mew", async () => {
);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -154,7 +154,7 @@ test("Agent can mewmew a mew, only once", async () => {
);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -224,6 +224,6 @@ test("Agent can quote a mew", async () => {
);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});
2 changes: 1 addition & 1 deletion tests/src/mewsfeed/mews/pinner-to-mews.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ test("link a Pinner to a Mew", async () => {
assert.equal(linksOutput.length, 0);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});
8 changes: 4 additions & 4 deletions tests/src/mewsfeed/mews/tags-to-mews.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ test("Hashtag, cashtag and mention", async () => {
assert.ok(mentionedMews.length === 1, "one mew with mention");
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -189,7 +189,7 @@ test("Prefix index should return hashtags and cashtags", async () => {
assert.equal(cashtags[0], "$cashtag", "hashtag search result matches");
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -388,7 +388,7 @@ test("Hashtags list are time-paginated", async () => {
assert.lengthOf(page5, 0);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});

Expand Down Expand Up @@ -593,6 +593,6 @@ test("Cashtags list are time-paginated", async () => {
assert.lengthOf(page5, 0);
},
true,
{ timeout: 100000 }
{ timeout: 500000 }
);
});
2 changes: 1 addition & 1 deletion tests/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { defineConfig } from "vitest/config";
export default defineConfig({
test: {
threads: false,
testTimeout: 60 * 1000 * 3, // 3 mins
testTimeout: 60 * 1000 * 10, // 10 mins
outputDiffLines: 100,
outputDiffMaxSize: 100000,
},
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/BaseMewContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<script setup lang="ts">
import { Mew, MewContentPart } from "@/types/types";
import { splitMewTextIntoContentParts } from "@/utils/tags";
import { splitMewTextIntoContentParts } from "@/utils/mewText";
import { computed, ref } from "vue";
import BaseMewContentTag from "./BaseMewContentTag.vue";
Expand Down
Loading

0 comments on commit 5741d29

Please sign in to comment.