diff --git a/.ert-runner b/.ert-runner new file mode 100644 index 0000000..e35e9c9 --- /dev/null +++ b/.ert-runner @@ -0,0 +1 @@ +-L . diff --git a/Cask b/Cask index 58124d6..a1fa8a0 100644 --- a/Cask +++ b/Cask @@ -5,6 +5,8 @@ (development (depends-on "ert") - (depends-on "ecukes") - (depends-on "espuds") - (depends-on "package-lint")) + (depends-on "ert-runner") + (depends-on "undercover") + (depends-on "package-lint") + (depends-on "assess" "0.4") + (depends-on "buttercup")) diff --git a/Makefile b/Makefile index 6aef0e7..4757c95 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ check : test lint test: unit unit: $(PKG_DIR) clean-elc - ${CASK} exec ecukes + ${CASK} exec buttercup -L . lint : $(SRCS) clean-elc # Byte compile all and stop on any warning or error diff --git a/features/beginend-dired.feature b/features/beginend-dired.feature deleted file mode 100644 index 459cfa8..0000000 --- a/features/beginend-dired.feature +++ /dev/null @@ -1,74 +0,0 @@ -Feature: When in dired mode, begin and end are changed - In order to navigate a dired buffer easily - As a user - I want that M-< and M-> go to first and last file - - Background: - Given I setup dired - - Scenario: No change when not activated - # avoid being at the right position already - Given I press "M->" - - When I press "M-<" - Then I should be at beginning of buffer - - Scenario outline: Press M-< once - Given I dired-omit-mode - And I dired-hide-details-mode - And I activate beginend-dired-mode - - # avoid being at the right position already - Given I press "M->" - - When I press "M-<" - Then I should be before "file1" - - Examples: - | activate omit | activate hide | - | activate | activate | - | activate | deactivate | - | deactivate | activate | - | deactivate | deactivate | - - Scenario outline: Press M-> once - Given I dired-omit-mode - And I dired-hide-details-mode - And I activate beginend-dired-mode - - # avoid being at the right position already - Given I press "M-<" - - When I press "M->" - Then I should be after "file2" - - Examples: - | activate omit | activate hide | - | activate | activate | - | activate | deactivate | - | deactivate | activate | - | deactivate | deactivate | - - Scenario: Press M-< twice - Given I activate beginend-dired-mode - - # avoid being at the right position already - Given I press "M->" - - Given I press "M-<" - And I should be before "file1" - - When I press "M-<" - Then I should be at beginning of buffer - - Scenario: Press M-> twice - Given I activate beginend-dired-mode - - # avoid being at the right position already - Given I press "M-<" - - Given I press "M->" - And I should be after "file2" - - When I press "M->" - Then I should be at end of buffer diff --git a/features/beginend-message.feature b/features/beginend-message.feature deleted file mode 100644 index 840366b..0000000 --- a/features/beginend-message.feature +++ /dev/null @@ -1,49 +0,0 @@ -Feature: When in message mode, begin and end are changed - In order to navigate a message buffer easily - As a user - I want that M-< go to the beginning of message body and M-> go to the line before signature - - Background: - Given I setup a message - - Scenario: Press M-< once - Given I activate beginend-message-mode - - # avoid being at the right position already - Given I press "M->" - - When I press "M-<" - Then I should be before "Hello," - - Scenario: Press M-> once - Given I activate beginend-message-mode - - # avoid being at the right position already - Given I press "M-<" - - When I press "M->" - Then I should be after "Bye," - - Scenario: Press M-< twice - Given I activate beginend-message-mode - - # avoid being at the right position already - Given I press "M->" - - Given I press "M-<" - And I should be before "Hello," - - When I press "M-<" - Then I should be at beginning of buffer - - Scenario: Press M-> twice - Given I activate beginend-message-mode - - # avoid being at the right position already - Given I press "M-<" - - Given I press "M->" - And I should be after "Bye," - - When I press "M->" - Then I should be at end of buffer diff --git a/features/step-definitions/beginend-steps.el b/features/step-definitions/beginend-steps.el deleted file mode 100644 index ead84c9..0000000 --- a/features/step-definitions/beginend-steps.el +++ /dev/null @@ -1,88 +0,0 @@ -;;; beginend-steps.el --- Step definitions for beginend -;;; Commentary: -;; -;; This file contains your project specific step definitions. All files in this -;; directory whose names end with "-steps.el" will be loaded automatically by -;; Ecukes. -;; -;;; Code: - -(require 'f) -(require 'thingatpt) - -(declare-function dired-omit-mode "dired-x") -(declare-function dired-hide-details-mode "dired") - -;; defined in env.el (which is loaded automatically by ecukes) -(eval-when-compile (defvar beginend--test-tempdir)) - -(Given "^I setup dired$" - (lambda () - (dired beginend--test-tempdir) - )) - -(Given "^I setup a message$" - (lambda () - (let ((buffer (generate-new-buffer "*beginend*"))) - (switch-to-buffer buffer) - (insert "From: someaddresse@foo.com\n\n") - (insert "Hello,\n\nBye,\n-- \nSome signature\n") - (message-mode)))) - -(Given "^I activate dired-omit-mode$" - (lambda () - (require 'dired-x) - (dired-omit-mode) - )) - -(Given "^I deactivate dired-omit-mode$" - (lambda () - (require 'dired-x) - (dired-omit-mode -1) - )) - -(And "^I deactivate dired-hide-details-mode$" - (lambda () - (dired-hide-details-mode -1))) - -(And "^I activate dired-hide-details-mode$" - (lambda () - (dired-hide-details-mode))) - -(Given "^I activate beginend-message-mode$" - (lambda () - (beginend-message-mode 1))) - -(Given "^I activate beginend-dired-mode$" - (lambda () - (beginend-dired-mode 1))) - -(Then "^I should be before \"\\([^\"]+\\)\"$" - (lambda (string) - (let ((message "Should have been before '%s' but is not (word at point is '%s').")) - (cl-assert - (looking-at string) - nil message string (word-at-point))))) - -(Then "^I should be after \"\\([^\"]+\\)\"$" - (lambda (string) - (let ((message "Should have been after '%s' but is not (word at point is '%s').")) - (cl-assert - (looking-back string) - nil message string (word-at-point))))) - -(Then "^I should be at beginning of buffer$" - (lambda () - (cl-assert - (bobp) - nil "Is not at the beginning of the buffer"))) - -(Then "^I should be at end of buffer$" - (lambda () - (cl-assert - (eobp) - nil "Is not at the end of the buffer"))) - -(provide 'beginend-steps) - -;;; beginend-steps.el ends here diff --git a/features/support/env.el b/features/support/env.el deleted file mode 100644 index 891546e..0000000 --- a/features/support/env.el +++ /dev/null @@ -1,37 +0,0 @@ -(require 'f) - -(defvar beginend-support-path - (f-dirname load-file-name)) - -(defvar beginend-features-path - (f-parent beginend-support-path)) - -(defvar beginend-root-path - (f-parent beginend-features-path)) - -(add-to-list 'load-path beginend-root-path) - -(require 'beginend) -(require 'espuds) -(require 'ert) - -(defvar beginend--test-tempdir) - -(Setup - ;; Before anything has run - ;; Create a temporary directory for dired-mode tests - (setq beginend--test-tempdir (make-temp-file "beginend-test" t)) - (f-touch (f-expand "file1" beginend--test-tempdir)) - (f-touch (f-expand "file2" beginend--test-tempdir))) - -(Before - ;; Before each scenario is run - ) - -(After - ;; After each scenario is run - ) - -(Teardown - (when beginend--test-tempdir - (f-delete beginend--test-tempdir t)))