diff options
| author |  Benjamin Jones <bjones@galois.com> | 2012-09-27 13:07:31 -0700 |
|---|---|---|
| committer | Benjamin Jones <bjones@galois.com> | 2012-09-27 13:07:31 -0700 |
| commit | f1eef25b51b55d134e4242dfaf393ab30a12851f (patch) | |
| tree | af0a03376bcdf98ed4a5b6041689782fa513b865 | |
| parent | c1b9103d298842b30e0c7e0481a803b217c0e837 (diff) | |
| parent | c722b96a4817688b403b9b121e89c73abf090314 (diff) | |
Merge branch 'trac53'
This addresses Trac issues 53 and 65.
| -rw-r--r-- | contexts/data/fiveui/chrome/background.js | 4 | ||||
| -rw-r--r-- | contexts/data/fiveui/firefox/options-script.js | 2 | ||||
| -rw-r--r-- | contexts/data/fiveui/injected/fiveui-injected-compute.js | 4 | ||||
| -rw-r--r-- | testrunner/.gitignore | 1 | ||||
| -rw-r--r-- | testrunner/README | 10 | ||||
| -rw-r--r-- | testrunner/programs.properties.example (renamed from testrunner/programs.properties) | 0 |
6 files changed, 16 insertions, 5 deletions
diff --git a/contexts/data/fiveui/chrome/background.js b/contexts/data/fiveui/chrome/background.js index 445b42c..eab6798 100644 --- a/contexts/data/fiveui/chrome/background.js +++ b/contexts/data/fiveui/chrome/background.js @@ -60,7 +60,7 @@ fiveui.chrome.background = function() { var script = scripts.shift(); - console.log('injecting: ' + script); + // console.log('injecting: ' + script); if (/css$/.test(script)) { chrome.tabs.insertCSS(tabid, { 'file' : script }, next); @@ -137,7 +137,7 @@ fiveui.chrome.background = function() { chrome.tabs.onCreated.addListener(function(tab) { - console.log('in oncreated'); + // console.log('in oncreated'); if (tab.url) { background.pageLoad(tab.id, tab.url); } diff --git a/contexts/data/fiveui/firefox/options-script.js b/contexts/data/fiveui/firefox/options-script.js index 050d036..2008883 100644 --- a/contexts/data/fiveui/firefox/options-script.js +++ b/contexts/data/fiveui/firefox/options-script.js @@ -21,7 +21,7 @@ (function() { $('#options-div').click(function() { - console.log('options-div handler'); + //console.log('options-div handler'); self.port.emit('showOptions'); }); })(); diff --git a/contexts/data/fiveui/injected/fiveui-injected-compute.js b/contexts/data/fiveui/injected/fiveui-injected-compute.js index 482cf23..97addb3 100644 --- a/contexts/data/fiveui/injected/fiveui-injected-compute.js +++ b/contexts/data/fiveui/injected/fiveui-injected-compute.js @@ -202,9 +202,9 @@ function(e) { var eTagName = e.target.tagName; if (eTagName == 'IFRAME' || eTagName == 'FRAME') { - console.log('frame added'); + // console.log('frame added'); e.target.onload = function() { - console.log('frame loaded'); + // console.log('frame loaded'); core.scheduleRules(); registerDomListeners(e.target.contentDocument); }; diff --git a/testrunner/.gitignore b/testrunner/.gitignore index 2f7896d..a16e1f1 100644 --- a/testrunner/.gitignore +++ b/testrunner/.gitignore @@ -1 +1,2 @@ target/ +programs.properties diff --git a/testrunner/README b/testrunner/README new file mode 100644 index 0000000..8e38b8f --- /dev/null +++ b/testrunner/README @@ -0,0 +1,10 @@ += Notes on running the test suite = + +The following command installs the neccesary `webdriver` JAR files to satisfy +the projects dependencies before testing: + + mvn install:install-file -Dfile=webdrivers-0.0.1-SNAPSHOT.jar \ + -DgroupId=com.galois.fiveui \ + -DartifactId=webdrivers \ + -Dversion=0.0.1-SNAPSHOT \ + -Dpackaging=jar diff --git a/testrunner/programs.properties b/testrunner/programs.properties.example index 397f33b..397f33b 100644 --- a/testrunner/programs.properties +++ b/testrunner/programs.properties.example |