From a905d46757c57602f30dcda73c9c62b7c757138a Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 29 May 2016 18:24:34 +0200 Subject: [PATCH] bdd: Merge userscripts.feature into spawn.feature --- tests/end2end/features/spawn.feature | 4 ++++ .../end2end/features/test_userscripts_bdd.py | 22 ------------------- tests/end2end/features/userscripts.feature | 3 --- 3 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 tests/end2end/features/test_userscripts_bdd.py delete mode 100644 tests/end2end/features/userscripts.feature diff --git a/tests/end2end/features/spawn.feature b/tests/end2end/features/spawn.feature index 861091f91..1887cfee0 100644 --- a/tests/end2end/features/spawn.feature +++ b/tests/end2end/features/spawn.feature @@ -8,6 +8,10 @@ Feature: :spawn When I run :spawn command_does_not_exist127623 Then the error "Error while spawning command: The process failed to start." should be shown + Scenario: Starting a userscript which doesn't exist + When I run :spawn -u this_does_not_exist + Then the error "Error while spawning userscript: The process failed to start." should be shown + Scenario: Running :spawn with invalid quoting When I run :spawn ""'"" Then the error "Error while splitting command: No closing quotation" should be shown diff --git a/tests/end2end/features/test_userscripts_bdd.py b/tests/end2end/features/test_userscripts_bdd.py deleted file mode 100644 index a945cd595..000000000 --- a/tests/end2end/features/test_userscripts_bdd.py +++ /dev/null @@ -1,22 +0,0 @@ -# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: - -# Copyright 2016 Florian Bruhin (The Compiler) -# -# This file is part of qutebrowser. -# -# qutebrowser is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# qutebrowser is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with qutebrowser. If not, see . - -import pytest_bdd as bdd - -bdd.scenarios('userscripts.feature') diff --git a/tests/end2end/features/userscripts.feature b/tests/end2end/features/userscripts.feature deleted file mode 100644 index d82d47c4f..000000000 --- a/tests/end2end/features/userscripts.feature +++ /dev/null @@ -1,3 +0,0 @@ -Scenario: Starting a userscript which doesn't exist - When I run :spawn -u this_does_not_exist - Then the error "Error while spawning userscript: The process failed to start." should be shown