More cleanup.

This commit is contained in:
James Cole
2016-01-24 18:11:57 +01:00
parent 7b2fe8eb4a
commit a013553a6c
18 changed files with 227 additions and 225 deletions

View File

@@ -24,9 +24,9 @@ class CsvControllerTest extends TestCase
// create session data:
$this->session($this->getSessionData());
$response = $this->call('GET', '/csv/column_roles');
$this->call('GET', '/csv/column_roles');
$this->assertEquals(200, $response->status());
$this->assertResponseStatus(200);
}
/**
@@ -36,8 +36,8 @@ class CsvControllerTest extends TestCase
{
$this->be($this->user());
$this->session($this->getSessionData());
$response = $this->call('GET', '/csv/download-config');
$this->assertEquals(200, $response->status());
$this->call('GET', '/csv/download-config');
$this->assertResponseStatus(200);
}
/**
@@ -47,8 +47,8 @@ class CsvControllerTest extends TestCase
{
$this->be($this->user());
$this->session($this->getSessionData());
$response = $this->call('GET', '/csv/download');
$this->assertEquals(200, $response->status());
$this->call('GET', '/csv/download');
$this->assertResponseStatus(200);
}
/**
@@ -58,8 +58,8 @@ class CsvControllerTest extends TestCase
{
$this->be($this->user());
$response = $this->call('GET', '/csv');
$this->assertEquals(200, $response->status());
$this->call('GET', '/csv');
$this->assertResponseStatus(200);
}
/**
@@ -86,9 +86,9 @@ class CsvControllerTest extends TestCase
$this->session($this->getSessionData());
$response = $this->call('POST', '/csv/initial_parse', $postData);
$this->call('POST', '/csv/initial_parse', $postData);
// should be redirect
$this->assertEquals(302, $response->status());
$this->assertResponseStatus(302);
// should be redirected to mapping:
$this->assertRedirectedToRoute('csv.map');
@@ -118,9 +118,9 @@ class CsvControllerTest extends TestCase
$this->session($this->getSessionData());
$response = $this->call('POST', '/csv/initial_parse', $postData);
$this->call('POST', '/csv/initial_parse', $postData);
// should be redirect
$this->assertEquals(302, $response->status());
$this->assertResponseStatus(302);
// should be redirected to download config:
$this->assertRedirectedToRoute('csv.download-config-page');
@@ -135,8 +135,8 @@ class CsvControllerTest extends TestCase
$this->session($this->getSessionData());
$response = $this->call('GET', '/csv/map');
$this->assertEquals(200, $response->status());
$this->call('GET', '/csv/map');
$this->assertResponseStatus(200);
}
@@ -147,8 +147,8 @@ class CsvControllerTest extends TestCase
{
$this->be($this->user());
$this->session($this->getSessionData());
$response = $this->call('GET', '/csv/process');
$this->assertEquals(200, $response->status());
$this->call('GET', '/csv/process');
$this->assertResponseStatus(200);
}
/**
@@ -175,9 +175,9 @@ class CsvControllerTest extends TestCase
'NL81LEJP9477634344' => '0', 'NL14JYVJ1041891180' => '0', 'NL57SPBS0788124528' => '0',
'NL96DZCO4665940223' => '2',],],];
$response = $this->call('POST', '/csv/save_mapping', $postData);
$this->call('POST', '/csv/save_mapping', $postData);
$this->assertEquals(302, $response->status());
$this->assertResponseStatus(302);
$this->assertRedirectedToRoute('csv.download-config-page');
}
@@ -195,7 +195,7 @@ class CsvControllerTest extends TestCase
'csv_import_account' => 1,
];
$response = $this->call('POST', '/csv/upload', $args, [], ['csv' => $file]);
$this->call('POST', '/csv/upload', $args, [], ['csv' => $file]);
// csv data set:
//$this->assertSessionHas('csv-file', 'abc');
@@ -208,7 +208,7 @@ class CsvControllerTest extends TestCase
$this->assertSessionHas('csv-import-account', 1);
$this->assertSessionHas('csv-delimiter', ',');
$this->assertEquals(302, $response->status());
$this->assertResponseStatus(302);
}
/**