From 0b4948823b3aa1bf6017b38b1735bb2ed1099fe1 Mon Sep 17 00:00:00 2001
From: tomasgodoi <tsmgodoi@gmail.com>
Date: Tue, 29 Aug 2017 17:16:06 -0300
Subject: [PATCH] Including tests for the Anki 2.1.x version.

---
 .travis.yml                            |  10 +++++++---
 tests/docker/{ => 2.0.x}/Dockerfile    |   0
 tests/docker/{ => 2.0.x}/entrypoint.sh |   0
 tests/docker/{ => 2.0.x}/prefs.db      | Bin
 tests/docker/2.1.x/Dockerfile          |  14 ++++++++++++++
 tests/docker/2.1.x/entrypoint.sh       |   8 ++++++++
 tests/docker/2.1.x/prefs21.db          | Bin 0 -> 5120 bytes
 7 files changed, 29 insertions(+), 3 deletions(-)
 rename tests/docker/{ => 2.0.x}/Dockerfile (100%)
 rename tests/docker/{ => 2.0.x}/entrypoint.sh (100%)
 rename tests/docker/{ => 2.0.x}/prefs.db (100%)
 create mode 100644 tests/docker/2.1.x/Dockerfile
 create mode 100755 tests/docker/2.1.x/entrypoint.sh
 create mode 100644 tests/docker/2.1.x/prefs21.db

diff --git a/.travis.yml b/.travis.yml
index de930d6..4cc34ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,12 @@ services:
 python:
   - "2.7"
 install:
-  - docker build -f tests/docker/Dockerfile -t txgio/anki-connect .
+  - docker build -f tests/docker/$ANKI_VERSION/Dockerfile -t txgio/anki-connect:$ANKI_VERSION .
 script:
-  - docker run -ti -d --rm -p 8888:8765 -e ANKICONNECT_BIND_ADDRESS=0.0.0.0 txgio/anki-connect
+  - docker run -ti -d --rm -p 8888:8765 -e ANKICONNECT_BIND_ADDRESS=0.0.0.0 txgio/anki-connect:$ANKI_VERSION
   - ./tests/scripts/wait-up.sh http://docker:8888
-  - python -m unittest discover -s tests -v
\ No newline at end of file
+  - python -m unittest discover -s tests -v
+
+env:
+  - ANKI_VERSION=2.0.x
+  - ANKI_VERSION=2.1.x
\ No newline at end of file
diff --git a/tests/docker/Dockerfile b/tests/docker/2.0.x/Dockerfile
similarity index 100%
rename from tests/docker/Dockerfile
rename to tests/docker/2.0.x/Dockerfile
diff --git a/tests/docker/entrypoint.sh b/tests/docker/2.0.x/entrypoint.sh
similarity index 100%
rename from tests/docker/entrypoint.sh
rename to tests/docker/2.0.x/entrypoint.sh
diff --git a/tests/docker/prefs.db b/tests/docker/2.0.x/prefs.db
similarity index 100%
rename from tests/docker/prefs.db
rename to tests/docker/2.0.x/prefs.db
diff --git a/tests/docker/2.1.x/Dockerfile b/tests/docker/2.1.x/Dockerfile
new file mode 100644
index 0000000..58e9572
--- /dev/null
+++ b/tests/docker/2.1.x/Dockerfile
@@ -0,0 +1,14 @@
+FROM txgio/anki:2.1.0beta14
+
+RUN apt-get update && \
+    apt-get install -y xvfb
+
+COPY AnkiConnect.py /data/addons21/AnkiConnect.py
+
+COPY tests/docker/prefs21.db /data/prefs21.db
+
+ADD tests/docker/entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
+
+CMD ["anki", "-b", "/data"]
\ No newline at end of file
diff --git a/tests/docker/2.1.x/entrypoint.sh b/tests/docker/2.1.x/entrypoint.sh
new file mode 100755
index 0000000..8285fb9
--- /dev/null
+++ b/tests/docker/2.1.x/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+
+# Start Xvfb
+Xvfb -ac -screen scrn 1280x2000x24 :99.0 &
+export DISPLAY=:99.0
+
+exec "$@"
\ No newline at end of file
diff --git a/tests/docker/2.1.x/prefs21.db b/tests/docker/2.1.x/prefs21.db
new file mode 100644
index 0000000000000000000000000000000000000000..dc4d505fe83bc0586426afba324103d21bddc15e
GIT binary patch
literal 5120
zcmeHKO>f*p7`E42QVps&a41og%7Vjg5efd-&l^b;r4gIZWK-vYx^mXDsadb>+T*m#
zEkg8w#4msoNB&BM#DxPtp?7Yyg6AE7Y!WyZ5Nr8k=9!sy=KUDY^9~OOzTo;KN@lLm
zZKbZLs`81hD~hs$=LVkgQc<9%ye^kZ?D}^_S%00}(q1VwZK`Nf?Zx#D%lgs+{}T&5
zQde%Tt*IC92=_GLaS~1ZfT!iRwtcj-dAy?^Z*C2C^b%#w(4BEz@Mi*;KXa40KIQX|
zbk7xT4u_G@!z>8yeO!C%_V${p_@T$2rB4Fv>yev@NY+QC#F1H+G}ygP8(h_XCl}nv
zKU7>^Z^8oVcdO6uJxqC`n@uk^*|3q$!||tl-e9rC4$@)6pT$uk_9Kr2ve}-=08*!Y
z?)fgT7TYr<7`Um}j)EvlfVLs(1H+i0*r5?|!ZFJ^hv?JDO+4V;av(*>5E6m)N-X7W
zGJbsDPeqi_V*0EZ#HK-_!fdwXj;C3i0yj;zXG_=(g6Qe}<NX1l7UW1Y6^S30D3+fu
zb>{lv34$_uy33;(4QNSaW2nF%9PAR(E=71e;DVRxnw=8ICZK*@IdX#VAIdcoMrz3E
z$tIu0!k_tHlKsp+4A|=TZKG#fJyK?|lA&+~^|1^H+_-qG*6)0^J30%ZQ#UAlbI!@M
zq#F&L_(>{`vJem{Cb4nCA%(09w_Kgc;}bUv#J~;D&`kc}G*o&gi?NwG*|Ty=n#JU^
z^r37*OQn<Nr}X#mHa#y2Y0M?xkiPpVO+b!WmvQ0Ka^R7H-7$MT%dpzLmeFh5xDn!Y
zmEm2}UMkv4?YB1(^UFDw7Fb%~AFu$^R@MBhslBb;QHy_@dJ9WYwT6Owc`Yrlv;bM)
zujl`TLyX}41tTz+144kKl?{vmOP!Jr<O~6Hz$w@O@q@vF3{c-oWPqrG!$YD3sZ$UE
z23jDgl5>>?<otj{UnK#=4#3a)Xebx}mSwQPx=EAyo}>eRbN=_yydn3$`h|k~Uwl13
zsnu7%ZTzRX^4IS|hi~pyIv|1yx=&Gb08dq9pMq#0y;pJloMwX3NgwA-Uj`5H{5*WF
zvwT*?QOWTuhUr{k_?H4`LGSYzvSn~r>|TbFWV=qq?ST;~rll?TG%<TL*le8oF&kxJ
z?2o4bABlO)fwx%Gc`!c|?TtfZEeSzw<{WO#1>Z~(caD08HOHedGM{nEct{0+U5rzI
z{rQDbqhPInh_mYiiR&-mus@=1p?;3~PpJP;hV$o{VHmE0(LDy^2|qMZ?lVDT|0uRh
zDp~ZhsoH`bWhMeY6p0A-Y?X%qEz%GNSqN&BggA>F1V};GrLW2i1aKc-Z5u7a?%Hi>
z*oDDl0s<!+?2N2)cHJJfNg(MDz5XEGUgrv`-$Uv5P_7rxO?+>@qDF|bAdXbENjJMi
Nr8d1fRPAE_{|SGCI$!_*

literal 0
HcmV?d00001