1 files changed, 18 insertions, 8 deletions
diff --git a/test/functional/plugin/matchparen_spec.lua b/test/functional/plugin/matchparen_spec.lua
index d8c1f2d392..3e1ab70daf 100644
--- a/test/functional/plugin/matchparen_spec.lua
+++ b/test/functional/plugin/matchparen_spec.lua
@@ -1,20 +1,30 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
+local plugin_helpers = require('test.functional.plugin.helpers')
 local Screen = require('test.functional.ui.screen')
-local clear, feed, execute = helpers.clear, helpers.feed, helpers.execute
 
-describe('matchparen', function() 
+local execute = helpers.execute
+local meths = helpers.meths
+local feed = helpers.feed
+local eq = helpers.eq
+
+local reset = plugin_helpers.reset
+
+describe('matchparen', function()
   local screen
 
   before_each(function()
-    clear()
+    reset()
     screen = Screen.new(20,5)
     screen:attach()
-    screen:set_default_attr_ignore( {{bold=true, foreground=Screen.colors.Blue}} )
+    screen:set_default_attr_ids( {
+      [0] = {bold=true, foreground=255},
+      [1] = {bold=true},
+    } )
   end)
 
   it('uses correct column after i_<Up>. Vim patch 7.4.1296', function()
-    execute('set noai nosi nocin')
-    execute('runtime plugin/matchparen.vim')
+    execute('set noautoindent nosmartindent nocindent laststatus=0')
+    eq(1, meths.get_var('loaded_matchparen'))
     feed('ivoid f_test()<cr>')
     feed('{<cr>')
     feed('}')
@@ -30,7 +40,7 @@ describe('matchparen', function()
       ^                    |
       }                   |
       {1:-- INSERT --}        |
-    ]], {[1] = {bold = true}})    
+    ]])
 
   end)
 end)