added general_rules to master rules for testing

MarioRuiz · May 27, 2020 · 5a3972d · 5a3972d
1 parent 9f576e4
commit 5a3972d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/spec/bot/smart-bot-example_rules.rb b/spec/bot/smart-bot-example_rules.rb
@@ -66,7 +66,7 @@ def rules(user, command, processed, dest, files = [], rules_file = "")
     end
   end
 
-  load './rules/general_rules.rb'
+  load "#{config.path}/rules/general_rules.rb"
   unless general_rules(user, command, processed, dest, files, rules_file)
 
     begin

diff --git a/spec/slack/smart-bot/commands/on_bot/add_shortcut_spec.rb b/spec/slack/smart-bot/commands/on_bot/add_shortcut_spec.rb
@@ -145,8 +145,7 @@
       send_message "bye bot", from: user, to: channel
     end
 
-    #todo: check why it is failing on travis but not locally
-    xit "calls shortcut using: shortcut NAME" do
+    it "calls shortcut using: shortcut NAME" do
       send_message "!shortcut example", from: user, to: channel
       sleep 2
       expect(buffer(to: channel, from: :ubot)[-1]).to match(/^Texto$/)