From e7c857b9f25890bcffafa6dcec6f99973cb298d4 Mon Sep 17 00:00:00 2001
From: Jeremy Saenz <jeremy.saenz@gmail.com>
Date: Sat, 26 Apr 2014 09:24:43 -0700
Subject: [PATCH] Fixed the master tests

---
 master_test.go | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/master_test.go b/master_test.go
index fec0e7b57..382feb222 100644
--- a/master_test.go
+++ b/master_test.go
@@ -1,51 +1,37 @@
 package gobot
 
 import (
-	"os"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"os"
 )
 
 var _ = Describe("Master", func() {
 	var (
-		myMaster *Master
+		m *Master
 	)
 
 	BeforeEach(func() {
-		myMaster = NewMaster()
-		myMaster.trap = func(c chan os.Signal) {
+		m = NewMaster()
+		m.trap = func(c chan os.Signal) {
 			c <- os.Interrupt
 		}
-		myMaster.Robots = []*Robot{
+		m.Robots = []*Robot{
 			newTestRobot("Robot 1"),
 			newTestRobot("Robot 2"),
 			newTestRobot("Robot 3"),
 		}
-		startApi = func(m *api) {}
-		myMaster.Start()
+		m.Api = NewApi()
+		m.Api.startFunc = func(m *api) {}
+		m.Start()
 	})
 
 	Context("when valid", func() {
 		It("should Find the specific robot", func() {
-			Expect(myMaster.FindRobot("Robot 1").Name).To(Equal("Robot 1"))
+			Expect(m.FindRobot("Robot 1").Name).To(Equal("Robot 1"))
 		})
 		It("should return nil if Robot doesn't exist", func() {
-			Expect(myMaster.FindRobot("Robot 4")).To(BeNil())
-		})
-		It("should Find the specific robot device", func() {
-			Expect(myMaster.FindRobotDevice("Robot 2", "Device 2").Name).To(Equal("Device 2"))
-		})
-		It("should return nil if the robot device doesn't exist", func() {
-			Expect(myMaster.FindRobotDevice("Robot 4", "Device 2")).To(BeNil())
-		})
-		It("should Find the specific robot connection", func() {
-			Expect(myMaster.FindRobotConnection("Robot 3", "Connection 1").Name).To(Equal("Connection 1"))
-		})
-		It("should return nil if the robot connection doesn't exist", func() {
-			Expect(myMaster.FindRobotConnection("Robot 4", "Connection 1")).To(BeNil())
-		})
-		It("Commands should return device commands", func() {
-			Expect(myMaster.FindRobotDevice("Robot 2", "Device 1").Commands()).To(Equal([]string{"TestDriverCommand", "DriverCommand"}))
+			Expect(m.FindRobot("Robot 4")).To(BeNil())
 		})
 	})
 })