tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ivan - Fix test issues [skip ci]

This commit is contained in:
ivan 2017-02-25 03:42:10 -03:00
parent 5126b40538
commit 7f1047b311
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/controllers/ticket/get.php
View File

@ -86,6 +86,6 @@ class TicketGetController extends Controller {
$user = Controller::getLoggedUser(); $user = Controller::getLoggedUser();
return (!Controller::isStaffLogged() && (Controller::isUserSystemEnabled() && $this->ticket->author->id !== $user->id)) || return (!Controller::isStaffLogged() && (Controller::isUserSystemEnabled() && $this->ticket->author->id !== $user->id)) ||
(Controller::isStaffLogged() && !$user->sharedDepartmentList->includesId($this->ticket->department->id)); (Controller::isStaffLogged() && (($this->ticket->owner && $this->ticket->owner->id !== $user->id) || !$user->sharedDepartmentList->includesId($this->ticket->department->id)));
} }
} }

2
server/libs/DataStoreList.php
View File

@ -46,7 +46,7 @@ class DataStoreList implements IteratorAggregate {
} }
public function isEmpty() { public function isEmpty() {
return empty($list); return empty($this->list);
} }
public function toBeanList() { public function toBeanList() {

8
tests/scripts.rb
View File

@ -10,7 +10,7 @@ class Scripts
raise response['message'] raise response['message']
end end
userRow = $database.getRow('user', email, 'email') userRow = $database.getRow('user', email, 'email')
response = request('/user/verify', { request('/user/verify', {
:email => email, :email => email,
:token => userRow['verification_token'] :token => userRow['verification_token']
}) })
@ -32,9 +32,9 @@ class Scripts
response['data'] response['data']
end end
def self.createTicket() def self.createTicket(title = 'Winter is coming')
result = request('/ticket/create', { result = request('/ticket/create', {
title: 'Winter is coming', title: title,
content: 'The north remembers', content: 'The north remembers',
departmentId: 1, departmentId: 1,
language: 'en', language: 'en',
@ -46,7 +46,7 @@ class Scripts
end end
def self.createAPIKey(name) def self.createAPIKey(name)
result = request('/system/add-api-key', { request('/system/add-api-key', {
csrf_userid: $csrf_userid, csrf_userid: $csrf_userid,
csrf_token: $csrf_token, csrf_token: $csrf_token,
name: name name: name

6
tests/system/disable-user-system.rb
View File

@ -9,7 +9,6 @@ describe'system/disable-user-system' do
password:$staff[:password] password:$staff[:password]
}) })
puts result['message']
(result['status']).should.equal('success') (result['status']).should.equal('success')
row = $database.getRow('setting', 'user-system-enabled', 'name') row = $database.getRow('setting', 'user-system-enabled', 'name')
@ -20,7 +19,7 @@ describe'system/disable-user-system' do
numberOftickets= $database.query("SELECT * FROM ticket WHERE author_id IS NULL AND author_email IS NOT NULL AND author_name IS NOT NULL") numberOftickets= $database.query("SELECT * FROM ticket WHERE author_id IS NULL AND author_email IS NOT NULL AND author_name IS NOT NULL")
(numberOftickets.num_rows).should.equal(35) (numberOftickets.num_rows).should.equal(36)
request('/user/logout') request('/user/logout')
@ -63,7 +62,6 @@ describe'system/disable-user-system' do
password:$staff[:password] password:$staff[:password]
}) })
puts result['message']
(result['status']).should.equal('success') (result['status']).should.equal('success')
row = $database.getRow('setting', 'user-system-enabled', 'name') row = $database.getRow('setting', 'user-system-enabled', 'name')
@ -71,7 +69,7 @@ describe'system/disable-user-system' do
numberOftickets= $database.query("SELECT * FROM ticket WHERE author_email IS NULL AND author_name IS NULL AND author_id IS NOT NULL" ) numberOftickets= $database.query("SELECT * FROM ticket WHERE author_email IS NULL AND author_name IS NULL AND author_id IS NOT NULL" )
(numberOftickets.num_rows).should.equal(35) (numberOftickets.num_rows).should.equal(36)
end end

30
tests/user/delete.rb
View File

@ -1,28 +1,30 @@
describe '/user/delete' do describe '/user/delete' do
request('/user/logout') request('/user/logout')
result = request('/user/login', {
email: 'staff@opensupports.com',
password: 'staff',
staff: true
})
$csrf_userid = result['data']['userId']
$csrf_token = result['data']['token']
it 'should delete user' do it 'should delete user' do
Scripts.createUser('deletable@opensupports.com', 'deletable')
Scripts.login('deletable@opensupports.com', 'deletable')
Scripts.createTicket('Ticket that will be deleted')
request('/user/logout')
Scripts.login('staff@opensupports.com', 'staff', true)
ticket = $database.getLastRow('ticket')
deletable_user = $database.getLastRow('user')
result = request('/user/delete', { result = request('/user/delete', {
userId: 4, userId: deletable_user['id'],
csrf_userid: $csrf_userid, csrf_userid: $csrf_userid,
csrf_token: $csrf_token csrf_token: $csrf_token
}) })
(result['status']).should.equal('success') (result['status']).should.equal('success')
user = $database.getRow('user', 4 , 'id') last_ticket = $database.getLastRow('ticket')
(user).should.equal(nil) last_log = $database.getLastRow('log')
user = $database.getRow('user', deletable_user['id'] , 'id')
lastLog = $database.getLastRow('log') (user).should.equal(nil)
(lastLog['type']).should.equal('DELETE_USER') (ticket['id']).should.not.equal(last_ticket['id'])
(last_log['type']).should.equal('DELETE_USER')
end end
end end