Add gif support, fix styling issues, fix login test (#784)
This commit is contained in:
parent
eca89ea9b4
commit
1d19d5578b
|
@ -7,7 +7,6 @@ import API from 'lib-app/api-call';
|
|||
import DateTransformer from 'lib-core/date-transformer';
|
||||
import Icon from 'core-components/icon';
|
||||
import Tooltip from 'core-components/tooltip';
|
||||
import TextEditor from 'core-components/text-editor';
|
||||
import Button from 'core-components/button';
|
||||
import SubmitButton from 'core-components/submit-button';
|
||||
import Form from 'core-components/form';
|
||||
|
|
|
@ -97,6 +97,7 @@
|
|||
padding: 28px 10px;
|
||||
text-align: left;
|
||||
position:relative;
|
||||
overflow-y: initial;
|
||||
|
||||
&:hover {
|
||||
.ticket-event__comment-content__edit {
|
||||
|
|
|
@ -31,6 +31,7 @@ class FileUploader extends React.Component {
|
|||
getMimeTypes() {
|
||||
return `
|
||||
image/png,
|
||||
image/gif,
|
||||
image/jpeg,
|
||||
image/bmp,
|
||||
image/tiff,
|
||||
|
|
|
@ -49,10 +49,16 @@ describe('sessionStore library', function () {
|
|||
});
|
||||
|
||||
it('should inform if it is logged in', function () {
|
||||
LocalStorageMock.getItem = stub().returns('TOKEN');
|
||||
LocalStorageMock.getItem = function (key) {
|
||||
if (key == `${root}_userId`) return 'USER_ID';
|
||||
if (key == `${root}_ticketNumber`) return '';
|
||||
};
|
||||
expect(sessionStore.isLoggedIn()).to.equal(true);
|
||||
|
||||
LocalStorageMock.getItem = stub().returns(null);
|
||||
LocalStorageMock.getItem = function (key) {
|
||||
if (key == 'userId') return 'USER_ID';
|
||||
if (key == 'ticketNumber') return 'TICKET_NUMBER';
|
||||
};
|
||||
expect(sessionStore.isLoggedIn()).to.equal(false);
|
||||
});
|
||||
|
||||
|
|
|
@ -7,9 +7,9 @@ build:
|
|||
@docker pull phpmyadmin/phpmyadmin
|
||||
@docker pull munkyboy/fakesmtp
|
||||
@docker build -t opensupports-srv . || echo "A${red}An error occurred${reset}"
|
||||
@docker network create os-net || true
|
||||
|
||||
install:
|
||||
@docker network create os-net || true
|
||||
@docker exec -it opensupports-srv bash -c "cd /var/www/html && composer install" || echo "${red}Please execute 'make run' first${reset}"
|
||||
@docker exec -it opensupports-db bash -c "mysql -u root -e \"CREATE DATABASE IF NOT EXISTS development;\" " || echo "${red}Please execute 'make run' first${reset}"
|
||||
|
||||
|
@ -20,7 +20,7 @@ run: stop
|
|||
@docker run -d --network os-net --name opensupports-srv -p 8080:80 --link opensupports-db:mysql --rm -e LOG_STDOUT=true -e LOG_STDERR=true -e LOG_LEVEL=debug -v ${PWD}:/var/www/html opensupports-srv
|
||||
|
||||
test:
|
||||
@./run-tests.sh
|
||||
@docker exec -it opensupports-srv bash -c "cd /var/www/html && ./run-tests.sh"
|
||||
|
||||
log:
|
||||
@docker attach opensupports-srv || echo "${red}Please execute 'make run' first${reset}"
|
||||
|
|
|
@ -23,6 +23,7 @@ class FileUploader extends FileManager {
|
|||
$file->addValidations(array(
|
||||
new \Upload\Validation\Mimetype([
|
||||
'image/png',
|
||||
'image/gif',
|
||||
'image/jpeg',
|
||||
'image/bmp',
|
||||
'image/tiff',
|
||||
|
|
|
@ -25,14 +25,6 @@ class LoginControllerTest extends TestCase {
|
|||
$this->loginController = new LoginController();
|
||||
}
|
||||
|
||||
public function testShouldRespondErrorIfAlreadyLoggedIn() {
|
||||
Session::mockInstanceFunction('sessionExists', \Mock::stub()->returns(true));
|
||||
|
||||
$this->expectExceptionMessage(ERRORS::SESSION_EXISTS);
|
||||
|
||||
$this->loginController->handler();
|
||||
}
|
||||
|
||||
public function testShouldCreateSessionAndRespondSuccessIfCredentialsAreValid() {
|
||||
Session::mockInstanceFunction('sessionExists', \Mock::stub()->returns(false));
|
||||
Controller::useValueReturn();
|
||||
|
|
Loading…
Reference in New Issue