Merge pull request #1314 from chrox/master

make coverage in after_success stage
pull/1322/head
Frans de Jonge 10 years ago
commit 2c1eacdbf5

@ -23,7 +23,7 @@ script:
- make fetchthirdparty all
- sudo cp base/build/*/luajit /usr/bin/
- make testfront
- make coverage
after_success:
- make coverage
- cd koreader-*/koreader && luacov-coveralls -v

@ -161,6 +161,7 @@ function FileManagerMenu:setUpdateItemTable()
end
function FileManagerMenu:onShowMenu()
local tab_index = G_reader_settings:readSetting("filemanagermenu_tab_index") or 1
if #self.tab_item_table.setting == 0 then
self:setUpdateItemTable()
end
@ -175,6 +176,7 @@ function FileManagerMenu:onShowMenu()
local TouchMenu = require("ui/widget/touchmenu")
main_menu = TouchMenu:new{
width = Screen:getWidth(),
last_index = tab_index,
tab_item_table = {
self.tab_item_table.setting,
self.tab_item_table.info,
@ -195,7 +197,7 @@ function FileManagerMenu:onShowMenu()
end
main_menu.close_callback = function ()
UIManager:close(menu_container)
self:onCloseFileManagerMenu()
end
menu_container[1] = main_menu
@ -207,6 +209,9 @@ function FileManagerMenu:onShowMenu()
end
function FileManagerMenu:onCloseFileManagerMenu()
local last_tab_index = self.menu_container[1].last_index
DEBUG("remember menu tab index", last_tab_index)
G_reader_settings:saveSetting("filemanagermenu_tab_index", last_tab_index)
UIManager:close(self.menu_container)
return true
end

@ -226,7 +226,7 @@ function ReaderMenu:onSetDimensions(dimen)
end
function ReaderMenu:onReadSettings(config)
self.last_tab_index = config:readSetting("menu_tab_index") or 1
self.last_tab_index = config:readSetting("readermenu_tab_index") or 1
end
function ReaderMenu:onSaveSettings()

@ -231,8 +231,8 @@ require("commonrequire")
local OPDSParser = require("ui/opdsparser")
local DEBUG = require("dbg")
describe("OPDS module", function()
describe("OPDS parser module #nocov", function()
describe("OPDS module #nocov", function()
describe("OPDS parser module", function()
it("should parse OPDS navigation catalog", function()
local catalog = OPDSParser:parse(navigation_sample)
local feed = catalog.feed

Loading…
Cancel
Save