mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-04 05:43:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Increase testcase delays

Browse Source 
Keep keys order when reversing array for stock location options
This commit is contained in:
jekkos
2015-07-14 18:17:54 +02:00
parent 80dcc2f63f
commit 491d8d0b72
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/reports.php
View File

@@ -338,7 +338,7 @@ class Reports extends Secure_area
$data = $this->_get_common_report_data();
$stock_locations = $this->Stock_locations->get_allowed_locations('sales');
$stock_locations['all'] = $this->lang->line('reports_all');
$data['stock_locations'] = array_reverse($stock_locations);
$data['stock_locations'] = array_reverse($stock_locations, TRUE);
$data['mode'] = 'sale';
$this->load->view("reports/date_input",$data);
}
@@ -348,7 +348,7 @@ class Reports extends Secure_area
$data = $this->_get_common_report_data();
$stock_locations = $this->Stock_locations->get_allowed_locations('receivings');
$stock_locations['all'] = $this->lang->line('reports_all');
$data['stock_locations'] = array_reverse($stock_locations);
$data['stock_locations'] = array_reverse($stock_locations, TRUE);
$data['mode'] = 'receiving';
$this->load->view("reports/date_input",$data);
}

4
test/giftcard_numbering.js
View File

@@ -29,9 +29,9 @@ describe("giftcard numbering test", function () {
it("issue #65: giftcard numbering should add properly", function() {
return this.browser.get(url("/index.php/giftcards")).waitForElementByCss(".big_button").click()
.waitForElementByName("value", 2000).type("100").elementById('giftcard_number').clear().type("10")
.elementById("submit").click().waitForElementByXPath("//table/tbody/tr[td/text()='10']/td[4]", 1000).text().then(function (value) {
.elementById("submit").click().waitForElementByXPath("//table/tbody/tr[td/text()='10']/td[4]", 2000).text().then(function (value) {
assert.ok(value, "giftcard failed to be added properly!");
}).elementByCss(".big_button").click().waitForElementByName("value", 1000).type("100").elementById("submit").click()
}).elementByCss(".big_button").click().waitForElementByName("value", 2000).type("100").elementById("submit").click()
.waitForElementByXPath("//table/tbody/tr[td/text()='11']/td[4]").text().then(function (value) {
assert.equal(value, "11", "giftcard number not incrementing properly!!");
});