fix env vars in tests

Author: Heliozoa

tmc-langs-cli/src/main.rs

@@ -224,7 +224,7 @@ fn run() -> Result<()> {
                     .required(true)
                     .takes_value(true)))
 
-            .subcommand(SubCommand::with_name("paste-with-comment")
+            .subcommand(SubCommand::with_name("paste")
                 .about("Send exercise to pastebin with comment.")
                 .arg(Arg::with_name("submission-url")
                     .long("submission-url")
@@ -236,7 +236,6 @@ fn run() -> Result<()> {
                     .takes_value(true))
                 .arg(Arg::with_name("paste-message")
                     .long("paste-message")
-                    .required(true)
                     .takes_value(true))
                 .arg(Arg::with_name("locale")
                     .help("Language as a three letter ISO 639-3 code, e.g. 'eng' or 'fin'.")
@@ -702,22 +701,22 @@ fn run() -> Result<()> {
                 .context("Failed to get courses")?;
 
             print_result_as_json(&courses)?;
-        } else if let Some(matches) = matches.subcommand_matches("paste-with-comment") {
+        } else if let Some(matches) = matches.subcommand_matches("paste") {
             let submission_url = matches.value_of("submission-url").unwrap();
             let submission_url = into_url(submission_url)?;
 
             let submission_path = matches.value_of("submission-path").unwrap();
             let submission_path = Path::new(submission_path);
-            let paste_message = matches.value_of("paste-message").unwrap();
+            let paste_message = matches.value_of("paste-message");
 
             let locale = matches.value_of("locale").unwrap();
             let locale = into_locale(locale)?;
 
             let new_submission = core
-                .paste_with_comment(
+                .paste(
                     submission_url,
                     submission_path,
-                    paste_message.to_string(),
+                    paste_message.map(str::to_string),
                     locale,
                 )
                 .context("Failed to get paste with comment")?;

tmc-langs-cli/tests/core_mock.rs

@@ -9,8 +9,8 @@ fn init() {
         env::set_var("RUST_LOG", "debug,hyper=warn,tokio_reactor=warn");
     }
     let _ = env_logger::builder().is_test(true).try_init();
-    env::set_var("TMC_CORE_CLI_ROOT_URL", mockito::server_url());
-    env::set_var("TMC_CORE_CLI_CONFIG_DIR", "./");
+    env::set_var("TMC_LANGS_ROOT_URL", mockito::server_url());
+    env::set_var("TMC_LANGS_CONFIG_DIR", "./");
 }
 
 fn run_cmd(args: &[&str]) -> Output {

tmc-langs-core/src/tmc_core.rs

@@ -290,11 +290,11 @@ impl TmcCore {
     ///     "my python solution".to_string(),
     ///     Language::Eng).unwrap();
     /// ```
-    pub fn paste_with_comment(
+    pub fn paste(
         &self,
         submission_url: Url,
         submission_path: &Path,
-        paste_message: String,
+        paste_message: Option<String>,
         locale: Language,
     ) -> Result<NewSubmission> {
         // compress
@@ -687,10 +687,10 @@ mod test {
             .create();
 
         let new_submission = core
-            .paste_with_comment(
+            .paste(
                 submission_url,
                 Path::new("tests/data/exercise"),
-                "abcdefg".to_string(),
+                Some("abcdefg".to_string()),
                 Language::from_639_3("eng").unwrap(),
             )
             .unwrap();

tmc-langs-core/src/tmc_core/api.rs

@@ -509,12 +509,15 @@ impl TmcCore {
         &self,
         submission_url: Url,
         submission: &Path,
-        paste_message: String,
+        paste_message: Option<String>,
         locale: Option<Language>,
     ) -> Result<NewSubmission> {
         let mut params = HashMap::new();
         params.insert("paste".to_string(), "1".to_string());
-        params.insert("message_for_paste".to_string(), paste_message);
+        params.insert(
+            "message_for_paste".to_string(),
+            paste_message.unwrap_or_default(), // TODO: can this field be ignored?
+        );
         self.post_submission_with_params(submission_url, submission, Some(params), locale)
     }