From 491d8d0b7202f781bb14bc710bb53543825dc074 Mon Sep 17 00:00:00 2001 From: jekkos Date: Tue, 14 Jul 2015 18:17:54 +0200 Subject: [PATCH] Increase testcase delays Keep keys order when reversing array for stock location options --- application/controllers/reports.php | 4 ++-- test/giftcard_numbering.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/controllers/reports.php b/application/controllers/reports.php index 80cce56ea..cb77b5fca 100644 --- a/application/controllers/reports.php +++ b/application/controllers/reports.php @@ -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); } diff --git a/test/giftcard_numbering.js b/test/giftcard_numbering.js index e5ef4a141..383d8eea1 100644 --- a/test/giftcard_numbering.js +++ b/test/giftcard_numbering.js @@ -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!!"); });