branch: elpa/dart-mode
commit 28ebbafb4d97079bb1a50dec2965b11a20a7aee2
Author: Brady Trainor <[email protected]>
Commit: Brady Trainor <[email protected]>
Update tests
---
.ert-runner | 1 -
.gitignore | 2 ++
.travis.yml | 14 ++++----------
Cask | 6 ++++--
Makefile | 23 ++++++++++++++++++++---
dart-mode.el | 3 ++-
test/breaks.dart | 18 ------------------
test/dart-mode-test.el | 14 --------------
test/idempotent.dart | 12 ------------
test/test-helper.el | 3 ---
10 files changed, 32 insertions(+), 64 deletions(-)
diff --git a/.ert-runner b/.ert-runner
deleted file mode 100644
index 76a85c9..0000000
--- a/.ert-runner
+++ /dev/null
@@ -1 +0,0 @@
--l dart-mode.el
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0cc4212
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.cask
+*.elc
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 44ec6b5..971f9c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,10 @@
-sudo: required
+dist: trusty
+sudo: false
-language: dart
-
-dart:
- - stable
- - dev
+language: generic
env:
- # - EVM_EMACS=emacs-24.1-travis
- # - EVM_EMACS=emacs-24.2-travis
- # - EVM_EMACS=emacs-24.3-travis
+ - EVM_EMACS=emacs-24.3-travis
- EVM_EMACS=emacs-24.4-travis
- EVM_EMACS=emacs-24.5-travis
- EVM_EMACS=emacs-25.1-travis
@@ -22,7 +17,6 @@ before_install:
- curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh
&& source ./x.sh
- evm install $EVM_EMACS --use --skip
- - cask --verbose
script:
- make
diff --git a/Cask b/Cask
index 402d804..953e1b0 100644
--- a/Cask
+++ b/Cask
@@ -1,6 +1,8 @@
(source gnu)
(source melpa)
-(package-file "dart-mode.el")
+(package "dart-mode" "2.0.0" "Major mode for editing Dart files")
-(depends-on "ert-runner")
+(development
+ (depends-on "ert-runner")
+ (depends-on "package-lint"))
diff --git a/Makefile b/Makefile
index 1841512..238c093 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,21 @@
-.PHONY: test
+all: package-lint dart-mode.elc checkdoc
-test:
- cask exec ert-runner
+.cask:
+ cask install
+
+package-lint: .cask
+ cask emacs -batch -l package-lint.el -f package-lint-batch-and-exit
+
+dart-mode.elc: .cask
+ cask emacs -batch -f batch-byte-compile dart-mode.el
+
+checkdoc:
+ emacs -batch -eval "(checkdoc-file \"dart-mode.el\")"
+
+clean: clean-cask clean-elc
+
+clean-cask:
+ rm -rf .cask
+
+clean-elc:
+ rm dart-mode.elc
diff --git a/dart-mode.el b/dart-mode.el
index 4bc33dd..ffb8d0e 100644
--- a/dart-mode.el
+++ b/dart-mode.el
@@ -404,7 +404,8 @@ untyped parameters. For example, in
(unless (looking-back (rx (or (and (or "do" "for" "if" "switch"
"while")
space)
"super")
- ?\())
+ ?\()
+ (point-at-bol))
(condition-case nil
(up-list)
(scan-error (throw 'result nil)))
diff --git a/test/breaks.dart b/test/breaks.dart
deleted file mode 100644
index 0c8daba..0000000
--- a/test/breaks.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-class _LoginPageState extends State<LoginPage> {
- Widget build(BuildContext context) {
- return new Scaffold(
- body: new SafeArea(
- child: new ListView(
- padding: const EdgeInsets.symmetric(horizontal: 24.0),
- children: <Widget>[
- new Column(
- ),
- const SizedBox(height: 120.0),
- TextField(
- decoration: InputDecoration(
- filled: true,
- ),
- ),
- ])));
- }
-}
diff --git a/test/dart-mode-test.el b/test/dart-mode-test.el
deleted file mode 100644
index 1ee30d9..0000000
--- a/test/dart-mode-test.el
+++ /dev/null
@@ -1,14 +0,0 @@
-;;; dart-mode-test.el --- Tests for dart-mode
-
-(require 'dart-mode)
-
-(ert-deftest dart-test ()
- (let ((file (make-temp-file "analysis")))
- (dart-add-analysis-root-for-file file)
- (let ((proc (dart--analysis-server-process
- dart--analysis-server)))
- (accept-process-output proc)
- (accept-process-output proc)
- (accept-process-output proc 8))))
-
-;;; dart-mode-test.el ends here
diff --git a/test/idempotent.dart b/test/idempotent.dart
deleted file mode 100644
index 6acf824..0000000
--- a/test/idempotent.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-class DartFormatter {
- DartFormatter(
- {this.lineEnding, int pageWidth, int indent, Iterable<StyleFix> fixes})
- : pageWidth = pageWidth ?? 80,
- indent = indent ?? 0 {}
-
- String format(String source, {uri}) {
- return formatSource(
- new SourceCode(source, uri: uri, isCompilationUnit: true))
- .text;
- }
-}
diff --git a/test/test-helper.el b/test/test-helper.el
deleted file mode 100644
index 707dfc1..0000000
--- a/test/test-helper.el
+++ /dev/null
@@ -1,3 +0,0 @@
-;;; test-helper.el --- Helpers for dart-mode-test.el
-
-;;; test-helper.el ends here
