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.

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

Move integration tests to cli/tests/ #2964

Merged
merged 7 commits into from
Sep 17, 2019
Merged

Move integration tests to cli/tests/ #2964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ce98ef
Allow deno_cli to be used as lib
ry Sep 16, 2019
8109675
Make integration_tests.rs a standard cargo integration_test
ry Sep 16, 2019
5bb5815
Fix tests
ry Sep 16, 2019
c7755bb
review comments
ry Sep 16, 2019
1a006ee
review
ry Sep 16, 2019
4c0ec53
Merge branch 'master' into cargo_test
ry Sep 16, 2019
b4a82a3
fix
ry Sep 16, 2019
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
2 changes: 1 addition & 1 deletion .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/js/deps/
/tests/error_syntax.js
cli/tests/error_syntax.js
4 changes: 2 additions & 2 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
tests/error_syntax.js
tests/badly_formatted.js
cli/tests/error_syntax.js
cli/tests/badly_formatted.js
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
# Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
[[bin]]
name = "deno"
path = "main.rs"

[package]
name = "deno_cli"
version = "0.18.3"
version = "0.18.4"
license = "MIT"
authors = ["the Deno authors"]
edition = "2018"
description = "Provides the deno executable"
repository = "https://github.com/denoland/deno"
default-run = "deno"

[lib]
name = "deno_cli"
path = "lib.rs"

[[bin]]
name = "deno"
path = "main.rs"

[dependencies]
deno = { path = "../core", version = "0.18.0" }
deno_cli_snapshots = { path = "../js", version = "0.18.3" }
Expand Down
1 change: 0 additions & 1 deletion cli/colors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ lazy_static! {
}

/// Helper function to strip ansi codes.
#[cfg(test)]
pub fn strip_ansi_codes(s: &str) -> std::borrow::Cow<str> {
STRIP_ANSI_RE.replace_all(s, "")
}
Expand Down
2 changes: 1 addition & 1 deletion cli/compilers/ts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ mod tests {
url: specifier.as_url().clone(),
filename: PathBuf::from(p.to_str().unwrap().to_string()),
media_type: msg::MediaType::TypeScript,
source_code: include_bytes!("../../tests/002_hello.ts").to_vec(),
source_code: include_bytes!("../tests/002_hello.ts").to_vec(),
};

let mock_state = ThreadSafeState::mock(vec![
Expand Down
Loading