diff --git a/features/data/journals/basic_dayone.dayone/entries/FD8ABC8EFED711EABC35FAFFC2100C3D.doentry b/features/data/journals/basic_dayone.dayone/entries/FD8ABC8EFED711EABC35FAFFC2100C3D.doentry
index 2480c71e..6eb2a2cc 100644
--- a/features/data/journals/basic_dayone.dayone/entries/FD8ABC8EFED711EABC35FAFFC2100C3D.doentry
+++ b/features/data/journals/basic_dayone.dayone/entries/FD8ABC8EFED711EABC35FAFFC2100C3D.doentry
@@ -5,7 +5,7 @@
 	<key>Creation Date</key>
 	<date>2020-09-24T16:14:00Z</date>
 	<key>Starred</key>
-	<false/>
+	<true/>
 	<key>Entry Text</key>
 	<string>The third entry finally after weeks without writing.
 I'm so excited about emojis. 💯 🎶 💩
diff --git a/features/data/journals/basic_encrypted.journal b/features/data/journals/basic_encrypted.journal
index c1bc70f4..ffc122df 100644
--- a/features/data/journals/basic_encrypted.journal
+++ b/features/data/journals/basic_encrypted.journal
@@ -1 +1 @@
-gAAAAABfbVS35o3E9LTX67HBLWu-gJiJI4t63YSime7LqohFOVS91k6uOBLqbZRtEZfBQ7mF9tmY_LB2BzX_x9ys05t1ePoKVr8X5MjWWkiz_4vlw6f58g5rlE0YMCCgGv_CW4awJdmrtnTqcXD8NJ5FwhPCT20KRrBGRRvFkmSROO_ziaLC8B2UTeZECkh8Pb_k6r2PvC7uf0DRXRyBXM9S6gLBnGklIo-1HjkGe45ih_VuRwP6IQV3zCQere5NIIx-O_oEFBYsBakOYm5lQjs8F1zQz8GlL7YtcCq2EbeiNoKKM-fleYmsa2FXML-U_5r3chFMYD5oOyb8VVVydCqDMhK8MrNltDj1exCD6Dl3Y9FnntsiVT6TEFCVZtGQT5XvbC4kBDQF6bgbxoAip0tmIliaKyXBSj1K6viC88nemyuMnoYZ0sOudc6iAg0jfWeh3fAu2Zg1-ridddbUdNK11-O6yTapWjjh2T6eFuAUcnQsfWEnTV2l1m2TwVoa801-IS87z69y7akiJfDztZMPFdziC0HYkRq9-5RUHtTIxgqyQR8u1biOdjHHZibsMnHFbTnAdAtXPmo9s55R0VQMf8hkVUmoecH8J9FbjfJTgmOyUlOPs0pjPBk4oMU9QGqV6rflFRi1CEEZNd-YHeHIEr8hh5GfznxTg9CuRxtw1mqa9438d4yNYb37ln_VgKs6G8QA8lMXxvCw_tUtbi7LhdmI3Sn7LfyfsWX1hJUlL-WNYzb882KD_QvjO9mSEkPjOKipPE7Pu2XvyNR8EBTrRGXUpEXOrxvTXmWKlJvo-f8hF80W5uuS5MXkqip-zS30_QRbE5yARG2BluAwax9bSFDnaaSR2P8J9rYE6c3wewLim93SOkTMPa95PSBBtLxBGqVWdUvuac3oqPO4-oPZS8zO5HTwRUrgR1fvf1-yylhHfYFbskQUz9GRKsKMOGh2Bne7f4aKDf9Qz8WtnYuAYhbhlwb88IbTtSlWPrv-yMCg7aIXhZRN1u_4FBWCjtY2QePVc0DjVnzQ-oL6sSIzvLIVoVaLQOMthkIQ6kBVvBiGaP8-BAkLCsVU8knhx-87xH4NYXp5hYEHSGPV5pIVC5__bY1WcbzO5yzfeo4CTeW5bKhjf5Hbr4dL7tvipYYgLgvnOG-iFpA3EKFNR0URw6bOvqJtbu-4EFqU--gY0oEDwv7T_gkhyXjd755Uq1L21UdSbbD3T6ldTv7UH8gnWYwA2uzPdibbRhvGmITFDLMNr0x5535lJuMeS1GQJUGe_4w_Z0eqj_S4DoynkeayCzZZeQFxKEKSqQGO2A2YxJaNN5o8o4QnTvHw6vCQWs2aH0Lkt2j_DBeetzKQD6C7kVQT_nVMK74Jm-Kg_CVblWQ_rbw5rrE9fUmRilfK6OJX2lBs9EAv1eVn_PxkXSPVqB0QjEYrFgpjnQ5uFt2zH3WHoUJ-TFr0FgjGKm3qwbl9e8uh1Rl1pud-LxYUaOIuzz_e1uwbVOcyzKgHxcVrTdAoI8TNgUqb3crUGPVAgusT-GKEpRNA8GQdIjcGXU6XkcDaBBzzflAlCIEf79iGANLYw2rwUN6XbQuAkcZH-Gf4p-oUa1WaclQP6YSIUVIz9dUoc6veCHM9DJyGwz6g5IhhsI_32AFv-E5sSVmb-BhCVHna5HwJoQOWAvcE2AL2v4rxx0Ipo1uY0hiDY2_oB9hiVOG0VW1jFCx8BEKqs35VBssl308I40TdHl1e8jDOnb308-C8SMqkryojhniOnVcOdY4i78pQKONZUXXeO2cKDWVmerzLNeBb_pSFWtjpPDGP0w_8fPQvH0ewzb7UNVRDEIOH6H2uZSXbeSwh6t7h_jULA0Q9iRvhtgdWCS_EnPr_N9D01XZ2Y8JjLDC5GMfZxk4nvetekHu3bcMMgeLt3DmQ4qfIKq9vsjg22hvdDvqYz6CgXmk7NrtKnrkPCYZ-GRnUl-Yu4psGupb14AggmnrB7raEH_3LtfQPFXOhcRaDdtayZZFdYIC7-BYn6p7v-NBA57fJZMY4e8vJG26WE1CS_iFFLfdW2l5OwDq1uOg9ugQuTiXXeCDHo1yjGMiyY-H9aaZKQecutdK8z4WVHI9ZZHexVhlXAOYNAA96yuCzizA0NtcugB7ohntgUIDW7Xm-b2lP84uAVT9hNPs7Gu5Lj_R-KScaBPIGEwtTxZRTber8acJNyIFqzHGG0E-rwOjCou-TsStMx0i9bJAmPu-LKPGfeWDTuxuDxgG4dWsxJSCUq4CKsF3V2CMf1qcrgRahIb17z2vOv5dXhH3SX_LhUDpalHVg5ZzLrH9KyQJeGeou6KLvXdPql1aCWIUlaNt3I5wg-UpB-VoA4UuvD0R5jui5trzUNiASlM6tJP2NhrHi1alzdxghn7AepRegCuIQfLbfD9D1zLUrbmsT2xDfZAwwTg0PVRtjS0PSHjZwvqJsKMX8v9HRUn5nfSEn_NKXzG-Yr89X_f7lsuWOajtv3FfCGt1E2ezVUejavpDcH0BM7j5OWnmSXfhAbgMJYRV6-7NUi2PlfUlpTjILO3znKvOQRjl498seHuW149KuoLjU_Ma3aFBRmx5n3mC40B2rvLPpq0dF3W9wRsFbcmECzUWoKQQxkkiyrGr-HDktWkDaISXpJ41smGB0N8zSlFThrZAXD12IGWB9PANTDW-UsnzdWjL6Kje8WHksTCFv84CLmuNuvU_ZdZG13oY5f_PgJqnXuyRYW4wCBsu9fqhIFIuC0aR6PjqxIJU8txoApfFtd_Q97sKaVPjFLtrTVfmI8NkH9Ha1ZwVdJ28JHDqXrsdzmSYmy7zzmekB2ix7-yLxgkutHFzmjjVNBeUxcgReZxrqG2Ur39cU1M2LjKmR7GURtAbYH5wSboq7_a8IRo6OH2pvGp5YqI4MvoSY0Yzv1XB6ojsFTDU1WPoenrb-ZMrPkBHYUVA6mr8v__SVLmlJD8b3KFbZJ1krVim9yJf6HsJcFvi7a-Jv4FPyc3NZU5MKQpnn0yzpXU3cBFYZcUiZtf9pzQ7VFr2UIg5OrJx0gpi8nzxLImT_wkj4QiBQ7CwD9i7BmzqLZeqQq0WA-khmDn_ezcpLMGtT2tWrV0U1125HiEfrkbhhbCAu9Fps3yw74xWkH3XnPZRmu_t_htB0iF2LbkrC1AfkhG8l0IfM9gBrE94Hl3cvTYaBr9tVc4TOIzrg7GPl9bJ-rUmohAb4T9bz73_9lhEvi4NxksQtNC061hK1xIbwbQaR6UvoUBz2-5kKYMvYYSPSbEwVbl6ngcUfhmbcZuq2gTQ84PsBJfXA6bfvMCiDFs_059_eoAQ-8AnVkjHj2wId-2SGXETF8ZDin3E4lNfsCB5TqzGJtSI9RPDuZtiUf5GxvBqzl5hVVbZ6rAEO78Ye8I3w-k2kUEqh0Ww3_EwuPbAxPP9-qoE3QIBqgvHj3BBw7Gm2-yiOnVPFQSwBpVcRIy-1J8vlabKJ7oUqgCjjOHbRpuoSsN34HrvCsonHBbqj0cP27jfUC-nIbcbzFR-UOpuOc78bRuznYhRVBcVmgQRlW6AxtrVU76QFI4jUGr6OYEfryIrj99XogH73mnp57d2gpgJSXdBN_TlXEAKIiJWmc_MW68X62AEtcaT2gFlcCDeLNMFn9mZcKXfP4wRzN2GHYemV-CLl4P64bc-93xMzH8hEJkwIyt4IgNgXU6XQE-z09CN1mSiGScmJ0ILQjG_nTivChe23i5KLKecsCjAaMoi770qiSlGCpAsoEokWQpIHnPd-r2YxxFLaH5K1Teu5CXTIA4yWrynsyIn1Au-1ueABwZxXR3s3g7QsFbjum1jJxGToUIRk5HaKbanfx-7aztqIQ9rRWPLJWM33p3hnooEGV41_VsYbsQ2GNO5my8qV_YnLQ6_WmhTyCbpTxHnXi0pf7oItGTnFBOJ1KL7gU7KarfcgyF6MjzJxC7tr9fLxhZjNgEP6QNqVCV6ocNRLs6DFNkhwoOzFh1dKOYV6vlSCXG_vfukawijfPYhtTKNJ3eM8kvDD0MhxJIUo29KkdsOV9HecmxaAo0TXQ_zjOwbw1OEG7IKiJGAvoWVp7sG6PxktC3aW_FKLcrYvmldHLYgQCSUuCiJtt0sA9NO-IhVpn-XS24lMSN0Q4VktAdpnvUVLDgI54iffivIUHvvvJHL6N69Da8A85D3L_IduGyr88YicA6nqSWEPL9GF3xWO-mWxaVaWTvNGRJSb_ZWFOf7XLMGaTEHeS5BAGxYimaUmlnhsfsO2TwBhf2zuEJFsxDrsu31q6C2joV9nga2XGCNzuMtEatJ9xJ4beL5DTsQ52OG3DGFs5BFF-eWnkmFLHClGvQgnC7kUVxApdoBMlvusespEuQ4VSadeXbG9YbMXzSaARg1UG_1wY7R3NaXeHbYlMcC1rQ1gLih8PaWH80WX0MAeTyUPrzexk_BtQSvyVH_dfyst8L-nisRQ78YoXJIjNmt93udk0r2oyoprhg_xHMpOt2_C2FYuJmoR9pnfOvcDdyGU1_qV7liA0mAQ60BXz94Gae5AvWOglcfooRwMLxjikyzqWwiEcVS9fPK_6lOSqM5EoBq-2QWMtcrNFD7x4knZVoLr7JXERo6kogDKK5xlFhgrUfsr3VRvSOBC-27v-U8yuM4N4nMt9ZEPAeT6T-okCIc2fEF6s-l8itNJMnYD3I2jd8w6FLT5i63H369v6YSg8aawhY_aFEhJKmCZ
+gAAAAABfb4gQBMqqGn_W8v_s7qCi14bX7inuCOKbsBqIUf7_ch14vTUp7lrysPFvhBp5vGijTwDIbk4LKoIISj8NwM31I8L0zEbMx9y6iyF_zseGGNxBvNN0wzAXa67bs-ohiQhhebcdIc_52sltxL2ELh8JAKUaXRwyapgnMgJ7z6deJppLK-B7RE7BiT0eKjWTDMd2x6cZDswvHs9opDp5yjuKWV5m7x6ggCKYgHT3savT9Tg7V0Fq6K3LGWaE59lCrqlAB0u6dnrDX3qcF4SKyckaniXzRShZGebdkUKDcLFun2V2syZwYQN772xjznIsJ16iXicox2uYKg8CnTefsyCwaOZyBvySGEy3CrlBiuIRIcxCtjKbYJ2B-Aq7LZitnBR7Ny_6_Wm8HsBf3N-cFCp4GShiCKrxuXKcOZ7vszG5EKb78JS85bb0mswU5CSdgp6UAHjIZqfJq00qQsViBCbXq3oklCPZXdQkOf5U0KpG2MVUiD-Zcn5Qj3gnUhSEr-5wKU9tWrE63MGPyE6KjZlArZX2W2LeGnW2CEYw9eREGon06AzLJ4mj3BgtjVWLIdGcCwORXvHRjUqazWgbEmXNVTbtp_cKnkW-rFzRBrUoVme9v-1Y3sH0VvHBq7QIj915VzBklzWs1qzIyTPZG5Db9LvdQ7SiV8slf1Jo7l-ayUUdVj6igvKZcgfB4RUHolJoMps5p4lZ5sPqv59KtSa8DCpuoRczIj71OCpuRVARZgy1m5sUD9xSMxOBdy46u1Jnry6iMtzXWI3mEZe5m7UhmW_L4Zcv4bbk8XjkBeHjPdgm2B69jkLmCBFecD5ztoGesCGt_pNo_sWSKqLHV1-coKFB2Nn__a4utU9NJNdeNRkr8_ahU6tn3jmaFjfQ7cKfrXG_NCcYBRX9fja8EQIeBEp_3TCoXQqhuV_bGsNPA2qL63Pt6YiRaUf1g9FNBqJRlKCSOYNixSXQZN_rTePzx0SQ0aIQhADWls62WX-LG5-byJcB6W2P_cH21hDOXkoNEIyLnCz9HQ6Yd6Fbv7298ps3F6jiUDdWES23zv8sDgBuKUN94qSN34j6MDYGFnGI9zsJ-Y-I2frdlLfWPx3pUL7afcKh1nRgXdjctsTSxU2BDrsu03eBz2IoZjoOR0U51IrNMOD1NNT3kctXxHLuOHSEkwAzS3doncQbdRLi5Gc1dQuOUa4sC-p8gVjUKXO-oi_49kp9Km2Ay9wFg0epBbXx2QMzyMsN2dXeSbHF-BDXD6sULaq5syC0fOHqaMLycTCMk2wLfNyXgEt05WvAiDn-LDsRdylMRW2hXp5HWq3Poaul-7VNg6UEMlwVfgJ-7hNreuO6IRtwmx6YdqMscw0ms6mU_MQZU_dTIPg3JU4KL0YyMqPBPSGNCx3gMp41O05Ubir45FoJSnT5Dkj4v3N0S87Ys3HuFLverASsGt9bkcSzd2uMKCJjkspemPPi9VhrY4IOO03DWSWbHmxYzFc1SJ-24WM8Ch404QKpe1qy5LNzFgLvDwQhSIHjluezHXqrD-DVh1lWNNY3WmHI2ubOZfaorvLKqzBPZ6AhpIa60rKjm0OZIQOmJwWXwkdnzut6m8PtoiLzRN897YMgeztf1nmDwp0xE-EhknVZ3WV3TeqgZJ5ykfHQ5BU8x0Db57-UtKSuesKbqPPdBe91OdsPpkGlyl6psHj1_gPm4nLvzXQePwiPaEemR_gYCWGPvl9l1ANJufgCV9qQTmZGof3fb9mjv-9lS-9l_m8KirPPRpSBToNeDtk50ceYUsOlDGzIyusppG9pOcIGyiln1IO5aZ8d4_1E83qjcHTSaKGizICZU7a-pt5STBPMesy3JgBm23A2jO4m68ayBRMcLnw_RirHvvBaj0C6UR2tac45F0Ob3PpXcvFuK0g54ziIAhzGqwF9I-LZ6asXQWMW4y4EBOak8JJBorkfztzfkMaIgGu-4ZoRKOkVfdr4uzcghk3r6KUxD4-nv1ioX69-G5RwhMHppYk7z8RXS1cq5FkvzXbfEQ-Uv6M-sx32DcUy9dH-ZYhc7UWm75JJfiNXLaXT_bsc6VqQ7KPkg2-RA7CywUFCW9S0S-XdO03VdwqlUVo7fp1SKywEfhZv_9bhDCdMJBwZmigv2KP9Iz7fF6LrpLwZkzHuQGFPcyTHFpsVIFrFyJjNYCXpET9y0Q5Vt4fnea5fy-9ZiCt3S8aS0YOFJ35_kM5i3ss8eFPL0v7fIQS3ZilzdGB3bWL0J7kppHN_ekHu-wVk3UZxauoFh7hXLjPcipua-FYUIklLjcK6DG1bYP7_q6OnkC8Jl650FNezeWPomHEv7l_DO3y0tjI6SGdWvL3ZJns7Xp3ew8KsCREAUO7ffqumD03uF9N-9uWbDDjM7rk0vcg0ggfOs9Ni725mxqYpu4R285XCOVWHDvw7iU6eAvE6ry8TDXQBbNgGjTuTYFYYli7GuOqMxFIe1op2s7sRnoJE8O0J76S6APhjhjcnZRSuONWkVG_5o83uFMPSF8DtqLwuRA5E8AGfIwAUcj324sw-DA0ixBGUqomb-osUIisv3x0b044xn-FvD-8R3PZDnPbPsao8XYNxfQWStrNcZSrX2Ua-WAcv9qbQ73_57RKW4pao4ajOu7K5800D231WGiIa6aJzDnFUlzXEzYxFQyx7qegkm_9rrEp_v8TC9mfAcjWX5DMrCkxUskx9YKDfpFYq4NuxO_414gReKzd-lmorfigvttgS10N1XD74SwFluXJv-bqTbI5-SuYAhDGMv1dqrn38i3rOMQqqnQomvaUJRprqxUsKz14sSE1Y-cNqq1FXzZ6vIJq-K3YTfFWPRLeqi6gHzqS_R2YBXXUduKuYgmakiVdP3bWc-Ca8WKh5sVi6P51MO-cS7i9AZWOaOz7F8PsB4JZxAJjSOr3NBmv3EEve9auTFCudRjfC6668I_NMHaTP5CCV4cuhuAxUuKUGgd6WFjDcvoYPyn_lu3bQiqD9MEag4CaJYI9PlraRv5mbqptwxv3pca7usd0GmXN_2No_nwxB4gVb48LsBBkH35njCa5iv2EKXUSOf0k3swaTSEahqbyI4EDzPXtU5uBO39iQzNpgfV_sUpnGdysjqueUVcdWGI_s5CnrNJ-_yDAY06AoXfLrjP8_3NXB2058xZ2rfmTNJNCULz9634dICJReXNnmplxIg3i6GbzFvjfNtqjrWr_iqBShyIwuOUJRbXzdJNggx2BDNG-PEWDXl89SaudFICkDvyZKEcATIss6ZXfULIMfCrqmWmFwgXfNEd9TuvjqoxFlLSaY4UfDMiYa_arUMblFfoo5nV07GANhUoQd-6HRe7LjYeX5VRodOx6ZmZjIAUq-DYr-hatJJFR2tjT_qZht2MJeYT3GZ3o54m8zBBt0JTN7HVpKaOaM3A2hEM_Ah0QZ-DkLDxtCzMuv987GDiLT2-Riya97a47yHIJhZFzFpflW2FcuC8RFWXlfUKTQfZkFmxh3MUekUuS4yu4Z121xojVswk_4P7-FqLaSnGT2epI69I_cvalRx3wjds9-5TFYqf4GridlFBRx6Fv2fpNB9Zvp9k7NQ9oYcPuXGLoXH5kmWBagPhEGKHA_pjFUZmCuwUIoeP4nP8lhFrX8OGezsbSBG773CRJzEdfcgAc5G-p6M_24WZLZHDrsVBAvgrNt6R9eQbEviWU28t_417QCp-or9qqt4OTKv1dp_4MlZh8YBg2-dtpvzSc1l5e4kQFJu7oWlpbgsjB6pl1oRRKp1maedX-gOAf559zC4l85gfEpPln9Cnl6xvERQzfO0Ey4q91SdsgK7i7FBrKKmi2wGiemFvnaQsrjZ_IFujLo8-2c8g9zTiyH1knyoVOAAnQxqGpsz6z6PNfSxr3_G8tOlNFTV-yqN_LdVHMgXtXjn3U9koGsfMulyUcBDdR3d_0Yn6iEjBt77tbxKi2ry-0gQrB1fdGsgKjyE_tMrW8D_lQz0IXsVOzd2ixsFVXMFzD6OOD8JldV0FbA-VDAS-Tp_ezIZVp6lRq54XBgvsjzDyOmOgDbSOQN6SQmvxPnIsml1wgmtm80z-9gHBqmimHBtLKB6L7CtLmmPICMS2pX3eWOmakxscxqs8AVjijJdz_NYNfcdBeDj_fhm6dqD6iwk3EBZZfsrmMGdXtAMqf1r9ng9tsz-FriXwQiJ3IM3loBsk5DKr9CcaJtKSPuwDDlRynD2vwcD-XyF6YTQdSJa9fEcq-qXya2Scj4mqQ4RDemJgErdradRfwJfII3fWHh18XxmYVqi9Bwn3YRgwEadyo0-HjbNq6vJXi12igmP99ciRAfMVQLjfUfTwoOHj44Y2Ru_hPjJcvB6FIn6KLrrCSrZnrshFdFn4L36z1CrS8fbtdvrG3kdZQxsUJnMqttuwKRpLnDWTWkIwj_GRBFrzCFgbwGp1XYhemxggyKVuhZPfyyTIM9rhlPth6eGyrpYfap24Av_mGPRBLnzcjtpGbACGdKQL034kVmI7yENGvmY40KSrWsVG_BE9bSJhx0EptFsT2IxnxbuFD4hGb4fFag9V0BDiKpUoOZqIVqVO8cAp-5w4twvWZKkrhu16JNlLoXWMoFANrw-tp5LKSin1CUeRa4LWVI1GR8tRkIad_GnCHRv9JEMswlNy9wi2sDNsSxWT7WNasUW5-glgK9pR7d2pXGGOWfHj1U6CKIqmAiO3iw8igzhvyx_dAxMxPo
\ No newline at end of file
diff --git a/features/data/journals/basic_folder/2020/08/31.txt b/features/data/journals/basic_folder/2020/08/31.txt
index 46cc28b6..826e7cdb 100644
--- a/features/data/journals/basic_folder/2020/08/31.txt
+++ b/features/data/journals/basic_folder/2020/08/31.txt
@@ -1,4 +1,4 @@
-[2020-08-31 02:32:00 PM] A second entry in what I hope to be a long series.
+[2020-08-31 02:32:00 PM] A second entry in what I hope to be a long series. *
 Sed sit amet metus et sapien feugiat elementum. Aliquam bibendum lobortis leo
 vitae tempus. Donec eleifend nec mi non volutpat. Lorem ipsum dolor sit amet,
 consectetur adipiscing elit. Praesent ut sodales libero. Maecenas nisl lorem,
diff --git a/features/data/journals/basic_onefile.journal b/features/data/journals/basic_onefile.journal
index 916f7d88..0d988049 100644
--- a/features/data/journals/basic_onefile.journal
+++ b/features/data/journals/basic_onefile.journal
@@ -19,7 +19,7 @@ velit scelerisque fringilla. Phasellus pharetra justo et nulla fringilla, ac
 porta sapien accumsan. Class aptent taciti sociosqu ad litora torquent per
 conubia nostra, per inceptos himenaeos.
 
-[2020-08-31 14:32] A second entry in what I hope to be a long series.
+[2020-08-31 14:32] A second entry in what I hope to be a long series. *
 
 Sed sit amet metus et sapien feugiat elementum. Aliquam bibendum lobortis leo
 vitae tempus. Donec eleifend nec mi non volutpat. Lorem ipsum dolor sit amet,
diff --git a/features/delete.feature b/features/delete.feature
index fc886f3d..fc117f05 100644
--- a/features/delete.feature
+++ b/features/delete.feature
@@ -104,90 +104,124 @@ Feature: Delete entries from journal
         # | basic_folder  | @todo
         # | basic_dayone  | @todo
 
-    Scenario: Delete flag with -and deletes boolean AND of tagged entries
-        Given we use the config "deletion_filters.yaml"
-        Then the journal should have 5 entries
-        When we run "jrnl --delete -and @holidays @springtime" and enter
+    Scenario Outline: Delete flag with -and deletes boolean AND of tagged entries
+        Given we use the config "<config>.yaml"
+        When we run "jrnl --delete -and @tagone @tagtwo" and enter
             """
             Y
             """
-        Then the journal should have 4 entries
-        And the journal should contain "[2019-10-01 08:00] It's just another day in October."
-        And the journal should contain "[2020-01-01 08:00] Happy New Year!"
-        And the journal should contain "[2020-03-01 08:00] It's just another day in March."
-        And the journal should contain "[2020-05-02 12:10] Writing tests. *"
-        But the journal should not contain "[2020-05-01 09:00] Happy May Day!"
+        Then we flush the output
+        When we run "jrnl -99 --short"
+        Then the output should be
+            """
+            2020-08-31 14:32 A second entry in what I hope to be a long series.
+            2020-09-24 09:14 The third entry finally after weeks without writing.
+            """
 
-    Scenario: Delete flag with -not does not delete entries from given tag
-        Given we use the config "deletion_filters.yaml"
-        Then the journal should have 5 entries
-        When we run "jrnl --delete @holidays -not @springtime" and enter
-            """
-            Y
-            """
-        Then the journal should have 4 entries
-        And the journal should contain "[2019-10-01 08:00] It's just another day in October."
-        And the journal should contain "[2020-03-01 08:00] It's just another day in March."
-        And the journal should contain "[2020-05-01 09:00] Happy May Day!"
-        And the journal should contain "[2020-05-02 12:10] Writing tests. *"
-        But the journal should not contain "[2020-01-01 08:00] Happy New Year!"
+        Examples: Configs
+        | config        |
+        | basic_onefile |
+        # | basic_folder  | @todo
+        # | basic_dayone  | @todo
 
-    Scenario: Delete flag with -from search operator only deletes entries since that date
-        Given we use the config "deletion_filters.yaml"
-        Then the journal should have 5 entries
-        When we run "jrnl --delete -from 2020-01-02" and enter
+    Scenario Outline: Delete flag with -not does not delete entries from given tag
+        Given we use the config "<config>.yaml"
+        When we run "jrnl --delete @tagone -not @ipsum" and enter
             """
             Y
-            Y
-            Y
             """
-        Then the journal should have 2 entries
-        And the journal should contain "[2019-10-01 08:00] It's just another day in October."
-        And the journal should contain "[2020-01-01 08:00] Happy New Year!"
-        And the journal should not contain "[2020-03-01 08:00] It's just another day in March."
-        And the journal should not contain "[2020-05-01 09:00] Happy May Day!"
-        And the journal should not contain "[2020-05-02 12:10] Writing tests."
+        Then we flush the output
+        When we run "jrnl -99 --short"
+        Then the output should be
+            """
+            2020-08-29 11:11 Entry the first.
+            2020-08-31 14:32 A second entry in what I hope to be a long series.
+            """
 
-    Scenario: Delete flag with -to only deletes entries up to specified date
-        Given we use the config "deletion_filters.yaml"
-        Then the journal should have 5 entries
-        When we run "jrnl --delete -to 2020-01-02" and enter
-            """
-            Y
-            Y
-            """
-        Then the journal should have 3 entries
-        And the journal should contain "[2020-03-01 08:00] It's just another day in March."
-        And the journal should contain "[2020-05-01 09:00] Happy May Day!"
-        And the journal should contain "[2020-05-02 12:10] Writing tests."
-        But the journal should not contain "[2019-10-01 08:00] It's just another day in October."
-        But the journal should not contain "[2020-01-01 08:00] Happy New Year!"
+        Examples: Configs
+        | config        |
+        | basic_onefile |
+        # | basic_folder  | @todo
+        # | basic_dayone  | @todo
 
-    Scenario: Delete flag with -starred only deletes starred entries
-        Given we use the config "deletion_filters.yaml"
-        Then the journal should have 5 entries
+    Scenario Outline: Delete flag with -from search operator only deletes entries since that date
+        Given we use the config "<config>.yaml"
+        When we run "jrnl --delete -from 2020-09-01" and enter
+            """
+            Y
+            """
+        Then we flush the output
+        When we run "jrnl -99 --short"
+        Then the output should be
+            """
+            2020-08-29 11:11 Entry the first.
+            2020-08-31 14:32 A second entry in what I hope to be a long series.
+            """
+
+        Examples: Configs
+        | config        |
+        | basic_onefile |
+        # | basic_folder  | @todo
+        # | basic_dayone  | @todo
+
+    Scenario Outline: Delete flag with -to only deletes entries up to specified date
+        Given we use the config "<config>.yaml"
+        When we run "jrnl --delete -to 2020-08-31" and enter
+            """
+            Y
+            Y
+            """
+        Then we flush the output
+        When we run "jrnl -99 --short"
+        Then the output should be
+            """
+            2020-09-24 09:14 The third entry finally after weeks without writing.
+            """
+
+        Examples: Configs
+        | config        |
+        | basic_onefile |
+        # | basic_folder  | @todo
+        # | basic_dayone  | @todo
+
+
+    Scenario Outline: Delete flag with -starred only deletes starred entries
+        Given we use the config "<config>.yaml"
         When we run "jrnl --delete -starred" and enter
             """
             Y
             """
-        Then the journal should have 4 entries
-        And the journal should contain "[2019-10-01 08:00] It's just another day in October."
-        And the journal should contain "[2020-01-01 08:00] Happy New Year!"
-        And the journal should contain "[2020-03-01 08:00] It's just another day in March."
-        And the journal should contain "[2020-05-01 09:00] Happy May Day!"
-        But the journal should not contain "[2020-05-02 12:10] Writing tests. *"
+        Then we flush the output
+        When we run "jrnl -99 --short"
+        Then the output should be
+            """
+            2020-08-29 11:11 Entry the first.
+            2020-09-24 09:14 The third entry finally after weeks without writing.
+            """
 
-    Scenario: Delete flag with -contains only entries containing expression
-        Given we use the config "deletion_filters.yaml"
-        Then the journal should have 5 entries
-        When we run "jrnl --delete -contains happy" and enter
+        Examples: Configs
+        | config        |
+        | basic_onefile |
+        # | basic_folder  | @todo
+        # | basic_dayone  | @todo
+
+    Scenario Outline: Delete flag with -contains only entries containing expression
+        Given we use the config "<config>.yaml"
+        When we run "jrnl --delete -contains dignissim" and enter
             """
             Y
-            Y
             """
-        Then the journal should have 3 entries
-        And the journal should contain "[2019-10-01 08:00] It's just another day in October."
-        And the journal should contain "[2020-03-01 08:00] It's just another day in March."
-        And the journal should contain "[2020-05-02 12:10] Writing tests. *"
-        But the journal should not contain "[2020-01-01 08:00] Happy New Year!"
-        But the journal should not contain "[2020-05-01 09:00] Happy May Day!"
+        Then we flush the output
+        When we run "jrnl -99 --short"
+        Then the output should be
+            """
+            2020-08-31 14:32 A second entry in what I hope to be a long series.
+            2020-09-24 09:14 The third entry finally after weeks without writing.
+            """
+
+        Examples: Configs
+        | config        |
+        | basic_onefile |
+        # | basic_folder  | @todo
+        # | basic_dayone  | @todo
+