Skip to content

Commit

Permalink
feat: make e2e work on macos
Browse files Browse the repository at this point in the history
  • Loading branch information
mateuszjasiuk committed Aug 9, 2023
1 parent ed57adc commit fb0aad5
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 9 deletions.
1 change: 0 additions & 1 deletion e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Package containing extension and web interface e2e tests.
- WIP :)

## Other stuff
- **So far only downloads namada linux binaries**
- **So far only works for namada 0.19** - you can change version in `./setup-namada.sh`
- **So far downloads MASP params every time we load extension**
- **Namada binaries, wasm checksums and wasms are cached** - they will dl again only if namada version changes
Expand Down
2 changes: 1 addition & 1 deletion e2e/genesis.toml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public_key = "002b5b8fda66fb6fc4ef0d86f84b21f250034077effc459fc2403a77a35aa95e3f
public_key = "0076a9df923fd0746a17682429ca1a5ff859f066c4be6c0bcdaaadb5f45524ad8a"

[implicit.TestB]
public_key = "000e5a813e23821025d56dd8f578b9bbfe6a215beb9d016807b16c1afb182c8e05"
public_key = "0041cca22e607fca642fb42640927f1d459e33f5e12e676ca1aa292fc6d9affbfa"
# Wasm VP definitions

# Implicit VP
Expand Down
18 changes: 14 additions & 4 deletions e2e/setup-namada.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ VERSION="v0.19.0"
CURRENT_VERSION=""
NAMADA_DIR=".namada"
NAMADA_BASE_DIR=".namada/basedir"
OS="Linux"

if [[ $OSTYPE == "darwin"* ]]; then
OS="Darwin"
fi

# Read current version
CURRENT_VERSION_PATH="${NAMADA_DIR}/.version"
Expand All @@ -17,7 +22,7 @@ fi

if [ "$CURRENT_VERSION" != "$VERSION" ]; then
# Download Namada binaries
FILENAME="namada-${VERSION}-Linux-x86_64.tar.gz"
FILENAME="namada-${VERSION}-${OS}-x86_64.tar.gz"
curl --location --remote-header-name --remote-name https://github.com/anoma/namada/releases/download/${VERSION}/${FILENAME}
mkdir $NAMADA_DIR
tar -xzf ${FILENAME} --directory $NAMADA_DIR --strip-components 1
Expand All @@ -37,7 +42,7 @@ if [ "$CURRENT_VERSION" != "$VERSION" ]; then

while read -r line;
do
WASM=$(echo "$line" | sed -E "s/\".+\":\s\"//g" | sed -E "s/\".*//g");
WASM=$(echo "$line" | sed -E "s/\".+\":[[:space:]]\"//g" | sed -E "s/\".*//g");
curl "${S3}/${WASM}" --output "${NAMADA_DIR}/wasm/${WASM}"

done < "$CHECKSUMS"
Expand Down Expand Up @@ -71,5 +76,10 @@ cp -f ${NAMADA_DIR}/wasm/*.wasm ${NAMADA_BASE_DIR}/${CHAIN_ID}/setup/validator-0
cp -f ${NAMADA_DIR}/wasm/*.wasm ${NAMADA_BASE_DIR}/${CHAIN_ID}/wasm/

# Override envs - so we do not have to rebuild extension and app
find ../apps/extension/build/chrome -type f -exec sed -i -E "s/dev-test\..{21}/$CHAIN_ID/g" {} +
find ../apps/namada-interface/build -type f -exec sed -i -E "s/dev-test\..{21}/$CHAIN_ID/g" {} +
if [[ $OS == "Darwin" ]]; then
LC_ALL=C find ../apps/extension/build/chrome -type f -name "*.js" -exec sed -i "" -E "s/dev-test\..{21}/$CHAIN_ID/g" {} +
LC_ALL=C find ../apps/namada-interface/build -type f -name "*.js" -exec sed -i "" -E "s/dev-test\..{21}/$CHAIN_ID/g" {} +
else
find ../apps/extension/build/chrome -type f -name "*.js" -exec sed -i -E "s/dev-test\..{21}/$CHAIN_ID/g" {} +
find ../apps/namada-interface/build -type f -name "*.js" -exec sed -i -E "s/dev-test\..{21}/$CHAIN_ID/g" {} +
fi
6 changes: 3 additions & 3 deletions e2e/src/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const puppeteerArgs = [
`--load-extension=${path}`,
"--disable-features=DialMediaRouteProvider",
];
jest.setTimeout(70000);
jest.setTimeout(120000);

let browser: puppeteer.Browser;
let page: puppeteer.Page;
Expand Down Expand Up @@ -117,7 +117,7 @@ describe("Namada extension", () => {
await openPopup();
// Check H1
const h1 = await page.$eval("h1", (e) => e.innerText);
expect(h1).toEqual("Anoma Browser Extension");
expect(h1).toEqual("Namada Browser Extension");
});
});

Expand Down Expand Up @@ -206,7 +206,7 @@ describe("Namada extension", () => {
// Fill transfer data
const [recipentInput, amountInput] = await page.$$("input");
await recipentInput.type(
"atest1d9khqw368qury3phx3prsvp4gezrssenxqmyxwpn8qmrqvpsg4znjdjp8ycry3p3g4p5vd6x66dnmw"
"atest1d9khqw36x9zr2s6pxymrv3z9xcen2s33gvmrxsfjgccnzd2rxez5z3fex5urgsjzg4qnsw2pef6prn"
);
await amountInput.type("10");

Expand Down

0 comments on commit fb0aad5

Please sign in to comment.