mirror of
https://github.com/nushell/nushell.git
synced 2025-08-18 14:00:58 +02:00
engine-q merge
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
<<<<<<< HEAD
|
||||
use nu_test_support::fs::AbsolutePath;
|
||||
use nu_test_support::playground::{says, Playground};
|
||||
use nu_test_support::{nu, pipeline};
|
||||
@@ -5,11 +6,16 @@ use nu_test_support::{nu, pipeline};
|
||||
use hamcrest2::assert_that;
|
||||
use hamcrest2::prelude::*;
|
||||
|
||||
=======
|
||||
use nu_test_support::{nu, pipeline};
|
||||
|
||||
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
|
||||
#[cfg(feature = "which-support")]
|
||||
mod environment;
|
||||
|
||||
mod pipeline;
|
||||
|
||||
<<<<<<< HEAD
|
||||
#[test]
|
||||
fn runs_configuration_startup_commands() {
|
||||
Playground::setup("init_config_startup_commands_test", |dirs, nu| {
|
||||
@@ -21,6 +27,10 @@ fn runs_configuration_startup_commands() {
|
||||
});
|
||||
}
|
||||
|
||||
=======
|
||||
//FIXME: jt: we need to focus some fixes on wix as the plugins will differ
|
||||
#[ignore]
|
||||
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
|
||||
#[test]
|
||||
fn plugins_are_declared_with_wix() {
|
||||
let actual = nu!(
|
||||
|
Reference in New Issue
Block a user