From 655a364fb1a6c9f3d49a0bbaf338bbf492b5b4d1 Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Mon, 19 Jun 2017 17:39:26 +0200 Subject: [PATCH] Remove local variables since it became easier to get the providers --- tests/integration/test-webpaste-providers.el | 90 ++++++-------------- 1 file changed, 26 insertions(+), 64 deletions(-) diff --git a/tests/integration/test-webpaste-providers.el b/tests/integration/test-webpaste-providers.el index 4cc24dd..83df1d8 100644 --- a/tests/integration/test-webpaste-providers.el +++ b/tests/integration/test-webpaste-providers.el @@ -8,119 +8,81 @@ (describe "Test provider with dummy data so it" - :var (paste-message) + :var (paste-message webpaste--paste-text webpaste--return-url) (before-each - ;; Block requests (setq paste-message ";; This is a build artifact created by an integration test for https://github.com/etu/webpaste.el") + ;; Block requests to failovers and returning of URLs (spy-on 'webpaste--paste-text) (spy-on 'webpaste--return-url)) + (it "can paste with ptpb.pw" - (let ((provider (webpaste--get-provider-by-name "ptpb.pw"))) - (funcall - provider - paste-message - :sync t) - - (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) - (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0) + (funcall (webpaste--get-provider-by-name "ptpb.pw") paste-message :sync t) - (expect (spy-calls-most-recent 'webpaste--return-url) - :to-equal - (make-spy-context :current-buffer (current-buffer) - :args '("https://ptpb.pw/h54Z") - :return-value nil)))) + (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) + (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0)) (it "can paste with ix.io" - (let ((provider (webpaste--get-provider-by-name "ix.io"))) - (funcall - provider - paste-message - :sync t) - - (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) - (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0) + (funcall (webpaste--get-provider-by-name "ix.io") paste-message :sync t) - (expect (spy-calls-most-recent 'webpaste--return-url) - :to-equal - (make-spy-context :current-buffer (current-buffer) - :args '("http://ix.io/xFF") - :return-value nil)))) + (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) + (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0)) (it "can paste with sprunge.us" - (let ((provider (webpaste--get-provider-by-name "sprunge.us"))) - (funcall - provider - paste-message - :sync t) + (funcall (webpaste--get-provider-by-name "sprunge.us") paste-message :sync t) - (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) - (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0))) + (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) + (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0)) (it "can paste with dpaste.com" - (let ((provider (webpaste--get-provider-by-name "dpaste.com"))) - (funcall - provider - paste-message - :sync t) + (funcall (webpaste--get-provider-by-name "dpaste.com") paste-message :sync t) - (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) - (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0))) + (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) + (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0)) (it "can paste with dpaste.de" - (let ((provider (webpaste--get-provider-by-name "dpaste.de"))) - (funcall - provider - paste-message - :sync t) + (funcall (webpaste--get-provider-by-name "dpaste.de") paste-message :sync t) - (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) - (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0))) + (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) + (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0)) (it "can paste with gist.github.com" - ;; Override function to extract filename from a filepath, otherwise it breaks during integration tests + ;; Override function to extract filename from a filepath, otherwise it breaks + ;; during integration tests (spy-on 'file-name-nondirectory :and-return-value "file.txt") - (let ((provider (webpaste--get-provider-by-name "gist.github.com"))) - (funcall - provider - paste-message - :sync t) + (funcall (webpaste--get-provider-by-name "gist.github.com") paste-message :sync t) - (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) - (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0))) + (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) + (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0)) (it "can paste with paste.pound-python.org" - (let ((provider (webpaste--get-provider-by-name "paste.pound-python.org"))) - (funcall - provider - paste-message - :sync t) + (funcall (webpaste--get-provider-by-name "paste.pound-python.org") paste-message :sync t) - (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) - (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0)))) + (expect (spy-calls-count 'webpaste--return-url) :to-equal 1) + (expect (spy-calls-count 'webpaste--paste-text) :to-equal 0))) ;;; test-webpaste-providers.el ends here