c-my/NEUP-FleaMarket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
whoisnian
2017-06-19 20:46:40 +08:00
parent a1273949d0
commit 21576cd7d0
7 changed files with 120 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/avatar_crop.js
+34
View File
@@ -0,0 +1,34 @@
function preview(file) {
var prevDiv = document.getElementById('preview');
if (file.files && file.files[0]) {
var prreader = new FileReader();
var reader = new FileReader();
reader.onload = function (evt) {
prevDiv.innerHTML = '<img id="avatarpreview" class="avatar" src="' + evt.target.result + '"/>';
$('#avatarpreview').cropper({
aspectRatio: 1 / 1,
autoCropArea: 1,
dragCrop: false,
crop: function (e) {
$('#avatarUploadCpX').val(e.x);
$('#avatarUploadCpY').val(e.y);
$('#avatarUploadCpWidth').val(e.width);
$('#avatarUploadCpHeight').val(e.height);
}
});
};
prreader.onload = function (evt) {
var fileBuf = new Uint8Array(evt.target.result.slice(0, 11));
/*var mime = isImage(fileBuf);
if (mime == null) {
alert("Please open image!");
return;
} else {*/
reader.readAsDataURL(file.files[0]);
//}
};
prreader.readAsArrayBuffer(file.files[0]);
} else {
prevDiv.innerHTML = '<div class="img" class="avatar" style="filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale,src=\'' + file.value + '\'"></div>';
}
}
resources/views/auth/register2.blade.php
+1
View File
@@ -32,6 +32,7 @@
}
}
</script>
<script src="/js/avatar_crop.js"></script>
@endsection
@section('content')
resources/views/user/editUserExtra.blade.php
+1 -38
View File
@@ -38,41 +38,4 @@
@endif
</div>
</div>
</div>
<script>
function preview(file) {
var prevDiv = document.getElementById('preview');
if (file.files && file.files[0]) {
var prreader = new FileReader();
var reader = new FileReader();
reader.onload = function (evt) {
prevDiv.innerHTML = '<img id="avatarpreview" class="avatar" src="' + evt.target.result + '"/>';
$('#avatarpreview').cropper({
aspectRatio: 1 / 1,
autoCropArea: 1,
dragCrop: false,
crop: function (e) {
$('#avatarUploadCpX').val(e.x);
$('#avatarUploadCpY').val(e.y);
$('#avatarUploadCpWidth').val(e.width);
$('#avatarUploadCpHeight').val(e.height);
}
});
};
prreader.onload = function (evt) {
var fileBuf = new Uint8Array(evt.target.result.slice(0, 11));
/*var mime = isImage(fileBuf);
if (mime == null) {
alert("Please open image!");
return;
} else {*/
reader.readAsDataURL(file.files[0]);
//}
};
prreader.readAsArrayBuffer(file.files[0]);
} else {
prevDiv.innerHTML = '<div class="img" class="avatar" style="filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale,src=\'' + file.value + '\'"></div>';
}
}
</script>
</div>
resources/views/user/user.blade.php
+1
View File
@@ -70,6 +70,7 @@
}
}
</script>
<script src="/js/avatar_crop.js"></script>
@endsection
@section('content')
tests/AuthTest.php
+12 -27
View File
@@ -34,30 +34,15 @@ class AuthTest extends BrowserKitTestCase
//test register
$this->visit('/register')
->see('邮箱')
->press('注册')
->see("邮箱不能为空")
->type('test', 'email')
->press('注册')
->see('邮箱格式不正确')
->type('test@example.com', 'email')
->type('test@example.com', 'password')
->type('test@example.com2', 'password_confirmation')
->press('注册')
->see('两次输入的密码不一致')
->type('test@example.com', 'email')
->type('test@example.com', 'password')
->type('test@example.com', 'password_confirmation')
->press('注册')
->see('已向您的邮箱发送一封验证邮件，请查收');
->see('校园统一身份认证服务平台');
//test register again
$this->visit('/register')
->type('test@example.com', 'email')
->type('test@example.com', 'password')
->type('test@example.com', 'password_confirmation')
->press('注册')
->see('已有用户使用该邮箱注册');
$user = new User;
$user->username = '';
$user->stuid = '';
$user->email = 'test@example.com';
$user->password = Hash::make('test@example.com');
$user->havecheckedemail = 0;
$user->save();
//test login
$this->visit('/login')
@@ -79,9 +64,9 @@ class AuthTest extends BrowserKitTestCase
->type('test@example.com', 'password')
->press('登录')
->see('昵称')
->see('上传头像')
->see('更改头像')
->type('aaa', 'nickname')
->press('保存')
->press('下一步')
->seePageIs('/register/2')
->see('aaa');
@@ -105,7 +90,7 @@ class AuthTest extends BrowserKitTestCase
->type('500', 'crop_height')
->type('0', 'crop_x')
->type('0', 'crop_y')
->press('保存')
->press('下一步')
->seePageIs('/register/3');
//test 3
@@ -163,7 +148,7 @@ class AuthTest extends BrowserKitTestCase
public function testPasswordForget()
{
$this->visit('/iforgotit')
->see('重置密码')
->see('忘记密码')
->type('admin@example.com', 'email')
->press('确定')
->see('已向你的邮箱发送一份包含重置密码的链接的邮件');
tests/GoodTest.php
+5 -8
View File
@@ -12,8 +12,9 @@ class GoodTest extends BrowserKitTestCase
{
//add good_cat
$cat = new GoodCat;
$cat->id = 1;
$cat->cat_name = '测试';
$cat->cat_index = '0';
$cat->cat_index = 0;
$cat->save();
//test add good
@@ -23,13 +24,12 @@ class GoodTest extends BrowserKitTestCase
->see('商品名不能为空')
->type('算法竞赛入门经典', 'good_name')
->select('1', 'cat_id')
->type('刘汝佳', 'description')
->press('添加')
->see('商品价格不能为空')
->type('aaa', 'price')
->press('添加')
->see('商品价格必须为数值')
->type('65.5', 'price')
->type('65', 'price')
->press('添加')
->see('库存数不能为空')
->select('1', 'type')
@@ -48,7 +48,7 @@ class GoodTest extends BrowserKitTestCase
->type('50', 'crop_x')
->type('137.5', 'crop_y')
->press('添加')
->see('65.5');
->see('65');
}
public function testGoodPic()
@@ -79,7 +79,6 @@ class GoodTest extends BrowserKitTestCase
->visit('/good/add')
->type('第二版', 'good_name')
->select('1', 'cat_id')
->type('刘汝佳', 'description')
->type('50', 'price')
->select('1', 'type')
->type('20', 'count')
@@ -152,7 +151,6 @@ class GoodTest extends BrowserKitTestCase
->press('更改')
->see('库存数必须是整数')
->type('10', 'count')
->type('汝佳大法好', 'description')
->type('666', 'price')
->type('10', 'count')
->attach(__DIR__ . '/resources/good.jpg', 'goodTitlePic')
@@ -162,7 +160,6 @@ class GoodTest extends BrowserKitTestCase
->type('108', 'crop_y')
->press('更改')
->see('￥666')
->see('汝佳大法好')
->visit('/good/'. sha1(1) .'/titlepic')
->seeHeader('Content-Type', 'image/jpeg')
->visit('/good/'. sha1(1) .'/titlepic/640/480')
@@ -202,6 +199,7 @@ class GoodTest extends BrowserKitTestCase
//test super administrator access and delete good
$this->withSession(['user_id' => 2, 'is_admin' => 2])
->visit('/good/1')
->see('算法竞赛入门经典')
->see('修改')
->see('删除')
->press('修改')
@@ -216,5 +214,4 @@ class GoodTest extends BrowserKitTestCase
->visit('/good/1/edit')
->see('商品ID错误');
}
}
tests/UserTest.php
+66 -7
View File
@@ -52,7 +52,7 @@ class UserTest extends BrowserKitTestCase
// test add username
$this->withSession(['user_id' => 1])
->visit('/user')
->visit('/user?tab=account')
->press('设置')
->see('用户名不可为空')
->type('*#^$%', 'username')
@@ -69,7 +69,7 @@ class UserTest extends BrowserKitTestCase
$this->withSession(['user_id' => 1])
->post('/user/edit/username', ['username' => 'newnewnew'])
->seeStatusCode(302);
$this->visit('/user')
$this->visit('/user?tab=account')
->dontSee('newnewnew')
->see('testusernameuname');
@@ -108,9 +108,6 @@ class UserTest extends BrowserKitTestCase
->press('解绑')
->see('验证完成后即可解绑此邮箱');
//test change password
$this->withSession(['user_id' => $nu->id])
->visit('/user?tab=account')
@@ -205,8 +202,6 @@ class UserTest extends BrowserKitTestCase
$this->withSession(['user_id' => 1])
->visit('/user/fav')
->see('编辑收藏夹')
->click('编辑收藏夹')
->seePageIs('/user/fav/edit')
->see('fav_test');
$this->withSession(['user_id' => 1])
->delete('/user/fav/del', ["del_goods" => [$good->id]])
@@ -218,4 +213,68 @@ class UserTest extends BrowserKitTestCase
->visit('/user/fav')
->dontSee('fav_test');
}
public function testAdminManage()
{
$this->visit('login')
->type('admin@example.com', 'username')
->type('admin@example.com', 'password')
->press('登录');
//test new notice
$this->visit('admin')
->type('testnotice', 'title')
->type('testnotice', 'content')
->press('发布公告')
->see('testnotice')
->visit('/')
->see('testnotice')
->visit('admin')
->press('删除')
->dontSee('testnotice');
//test new cat_name
$this->visit('admin')
->type('testcat', 'cat_name')
->press('提交')
->see('testcat')
->visit('/')
->see('testcat')
->visit('admin')
->press('删除')
->dontSee('testcat');
//test report
$this->withSession(['user_id' => 1, 'is_admin' => 0])
->visit('/user/2')
->press('举报该用户')
->type('He is selling a gay!', 'reason')
->press('确认举报')
->see('举报成功')
->visit('logout');
$this->visit('login')
->type('admin@example.com', 'username')
->type('admin@example.com', 'password')
->press('登录')
->visit('admin')
->see('He is selling a gay!')
->press('领取')
->seePageIs('/message')
->visit('admin')
->see('批准显示')
->see('驳回此条')
->press('批准显示')
->see('已批准');
//test list all users
$this->visit('admin')
->see('test@example.com')
->see('admin@example.com');
//test ban
$this->visit('/user/1')
->press('封禁该用户')
->seePageIs('/user/1/banpage');
}
}