Skip to content

Extract e2e testing framework to its own crate #1429

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

Merged
ascjones merged 12 commits into from
Oct 6, 2022
Merged

Extract e2e testing framework to its own crate #1429

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e8f493e
Extract e2e to standalone crate
ascjones Sep 29, 2022
701c572
WIP moving e2e macro code to e2e macro crate
ascjones Sep 29, 2022
d288fa9
Fix remaining macro errors
ascjones Sep 29, 2022
78e72f5
Fix some more errors
ascjones Sep 29, 2022
d7c2497
Fmt
ascjones Sep 29, 2022
8cd30bd
Remove redundant import
ascjones Sep 30, 2022
5909a14
Fix UI tests
ascjones Sep 30, 2022
6463e34
Use new release of `cargo-contract` in CI
ascjones Oct 3, 2022
1e0d06e
Fix e2e refs and update smart-bench-macro branch
ascjones Oct 4, 2022
a6478b5
Add TODO
ascjones Oct 4, 2022
7e63d1c
Replace tokio::test macro with explicit async init
ascjones Oct 6, 2022
791afbc
Fix integration test compilation
ascjones Oct 6, 2022
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
Fmt
  • Loading branch information
@ascjones
ascjones committed Sep 29, 2022
commit d7c2497c43d53ab6ea4e382b1775101fdc213a3e
3 changes: 2 additions & 1 deletion crates/e2e/macro/src/ir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
// limitations under the License.

use crate::{
config::E2EConfig, ir,
config::E2EConfig,
ir,
};
use proc_macro2::TokenStream as TokenStream2;

Expand Down
4 changes: 2 additions & 2 deletions crates/e2e/macro/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

// extern crate proc_macro;

mod config;
mod codegen;
mod config;
mod ir;

use proc_macro::TokenStream;
Expand Down Expand Up @@ -163,4 +163,4 @@ fn generate_or_err(attr: TokenStream2, input: TokenStream2) -> Result<TokenStrea
let test_definition = ir::InkE2ETest::new(attr, input)?;
let codegen = codegen::InkE2ETest::from(test_definition);
Ok(codegen.generate_code())
}
}
2 changes: 1 addition & 1 deletion crates/e2e/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ use pallet_contracts_primitives::{
pub use smart_bench_macro;
use xts::ContractsApi;

pub use ink_e2e_macro::e2e_test;
pub use env_logger;
pub use ink_e2e_macro::e2e_test;
pub use sp_keyring::AccountKeyring;
pub use subxt::tx::PairSigner;
pub use tokio;
Expand Down