From 30f0bf9d163975f3a0a26144e54f1f1c7a563a61 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 7 Dec 2023 16:07:29 +0800 Subject: [PATCH] - Remove tutorialModel::checkNovice and its unit test, it's not used. --- module/tutorial/model.php | 22 +------------------- module/tutorial/test/model/checknovice.php | 24 ---------------------- module/tutorial/test/tutorial.class.php | 17 +-------------- 3 files changed, 2 insertions(+), 61 deletions(-) delete mode 100755 module/tutorial/test/model/checknovice.php diff --git a/module/tutorial/model.php b/module/tutorial/model.php index a2ccd9a990..ef79b95cc7 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -1,4 +1,5 @@ app->user->account; - if($account == 'guest') return false; - if(!empty($this->app->user->modifyPassword)) return false; - - $count = $this->dao->select('count(*) AS count')->from(TABLE_ACTION)->where('actor')->eq($account)->fetch('count'); - if($count < 10) return true; - - $this->loadModel('setting')->setItem($account . '.common.global.novice', 0); - return false; - - } - /** * 获取新手模式产品键值对。 * Get tutorial product pairs. diff --git a/module/tutorial/test/model/checknovice.php b/module/tutorial/test/model/checknovice.php deleted file mode 100755 index b6923a9300..0000000000 --- a/module/tutorial/test/model/checknovice.php +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env php -checkNovice(); -cid=1 -pid=1 - -检查当account是admin的时候的返回值。 >> 0 -检查当->app->user->modifyPassword是不为空的时候的返回值。 >> 0 -检查当account是guest的时候的返回值。 >> 0 - -*/ - -$tutorial = new tutorialTest(); - -r($tutorial->checkNoviceTest()) && p() && e('0'); //检查当account是admin的时候的返回值。 -r($tutorial->checkNoviceTest()) && p() && e('0'); //检查当$this->app->user->modifyPassword是不为空的时候的返回值。 -su('guest'); -r($tutorial->checkNoviceTest()) && p() && e('0'); //检查当account是guest的时候的返回值。 \ No newline at end of file diff --git a/module/tutorial/test/tutorial.class.php b/module/tutorial/test/tutorial.class.php index c2d3157252..7d457681d7 100644 --- a/module/tutorial/test/tutorial.class.php +++ b/module/tutorial/test/tutorial.class.php @@ -1,4 +1,5 @@ objectModel = $tester->loadModel('tutorial'); } - /** - * Check novice. - * - * @access public - * @return void - */ - public function checkNoviceTest() - { - $this->app->user->modifyPassword = 1; - $objects = $this->objectModel->checkNovice(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - /** * Get tutorial product pairs. *