From 0ae0a2f4d4e656e0eb781e5127909840534f293b Mon Sep 17 00:00:00 2001
From: dickmao <dick.r.chiang@gmail.com>
Date: Fri, 12 Oct 2018 18:49:50 -0400
Subject: [PATCH] workaround for emacs-26.1 travis

Delete the org-plus-contrib dependency in Cask via a fast switcheroo
in install-cask.sh
---
 .travis.yml           | 1 +
 Cask                  | 3 +--
 features/undo.feature | 9 ++++-----
 test/test-ein-core.el | 8 ++++----
 tools/install-cask.sh | 7 +++++++
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fc61205..e874cec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ env:
     - PATH=$HOME/local/bin:$HOME/local/evm/bin:$HOME/local/cask/bin:$PATH
   matrix:
     - EVM_EMACS=emacs-25.2-travis EL_REQUEST_BACKEND=curl
+    - EVM_EMACS=emacs-26.1-travis EL_REQUEST_BACKEND=curl
 
 matrix:
   allow_failures:
diff --git a/Cask b/Cask
index d155781..a90c43a 100644
--- a/Cask
+++ b/Cask
@@ -14,8 +14,7 @@
  (depends-on "cl-generic")
  (depends-on "company")
  (depends-on "ess")
- ;;  (depends-on "org" "9.0") ;; doesn't work 
- (depends-on "org-plus-contrib" "9.0.0") ;; see https://github.com/cask/cask/issues/119
+ (depends-on "org-plus-contrib") ;; see https://github.com/cask/cask/issues/119
  (depends-on "markdown-mode")
  (depends-on "smartrep")
  (depends-on "ert-runner")
diff --git a/features/undo.feature b/features/undo.feature
index cbccf2c..bebda39 100644
--- a/features/undo.feature
+++ b/features/undo.feature
@@ -48,6 +48,7 @@ Scenario: Collapse doesn't break undo
   And I undo again
   Then the cursor should be at point "55"
 
+@prob
 Scenario: Test the conflagrative commands
   Given I enable "ein:worksheet-enable-undo"
   Given new default notebook
@@ -61,24 +62,22 @@ Scenario: Test the conflagrative commands
   And I press "C-<up>"
   And I press "C-<up>"
   And I press "C-n"
-  And I type "print("math imported")"
+  And I type "print("m")"
   And I wait for cell to execute
   And I press "C-u C-c C-v"
   And I press "C-/"
-  Then the cursor should be at point "43"
-  And I undo again
+  Then the cursor should be at point "22"
   And I undo again
   And I dump buffer
   Then the cursor should be at point "83"
   And I press "C-c C-v"
   And I press "C-/"
   And I undo again
-  Then the cursor should be at point "43"
+  Then the cursor should be at point "22"
   And I press "C-c C-S-l"
   And I press "C-/"
   And I undo again
   And I undo again
-  And I undo again
   Then the cursor should be at point "22"
 
 Scenario: Clear output doesn't break undo
diff --git a/test/test-ein-core.el b/test/test-ein-core.el
index 1216808..22c86e2 100644
--- a/test/test-ein-core.el
+++ b/test/test-ein-core.el
@@ -49,7 +49,7 @@
 
 (ert-deftest ein:filename-translations-from-to-tramp ()
   ;; I really don't understand this https://github.com/magit/with-editor/issues/29
-  :expected-result (if (search " 26." (emacs-version)) :failed :passed)
+  :expected-result (if (>= emacs-major-version 26) :failed :passed)
   (loop with ein:filename-translations =
         `((8888 . ,(ein:tramp-create-filename-translator "HOST" "USER")))
         with filename = "/file/name"
@@ -61,7 +61,7 @@
                    filename))))
 
 (ert-deftest ein:filename-translations-to-from-tramp ()
-  :expected-result (if (search " 26." (emacs-version)) :failed :passed)
+  :expected-result (if (>= emacs-major-version 26) :failed :passed)
   (loop with ein:filename-translations =
         `((8888 . ,(ein:tramp-create-filename-translator "HOST" "USER")))
         with filename = "/USER@HOST:/filename"
@@ -72,7 +72,7 @@
                    filename))))
 
 (ert-deftest ein:filename-to-python-tramp ()
-  :expected-result (if (search " 26." (emacs-version)) :failed :passed)
+  :expected-result (if (>= emacs-major-version 26) :failed :passed)
   (let* ((port 8888)
          (ein:filename-translations
           `((,port . ,(ein:tramp-create-filename-translator "DUMMY")))))
@@ -86,7 +86,7 @@
     (should-error (ein:filename-to-python port "/file/name"))))
 
 (ert-deftest ein:filename-from-python-tramp ()
-  :expected-result (if (search " 26." (emacs-version)) :failed :passed)
+  :expected-result (if (>= emacs-major-version 26) :failed :passed)
   (loop with ein:filename-translations =
         `((8888 . ,(ein:tramp-create-filename-translator "HOST" "USER")))
         with python-filename = "/file/name"
diff --git a/tools/install-cask.sh b/tools/install-cask.sh
index 08fb8b5..cd773ba 100644
--- a/tools/install-cask.sh
+++ b/tools/install-cask.sh
@@ -16,6 +16,13 @@ cask_upgrade_cask_or_reset() {
 }
 
 cask_install_or_reset() {
+    if [ $(cask eval "(princ emacs-major-version)") -gt "25" ]; then
+        echo "!!!! ALERT WORKAROUND !!!!"
+        set -x
+        grep -v "org-plus-contrib" ./Cask > ./Cask.tmp
+        mv ./Cask.tmp ./Cask
+        set +x
+    fi
     cask install || { rm -rf .cask && false; }
 }