Improve brunch push handling

root · root · commit b159d9a7c85f · 2015-03-11T09:15:20.000-04:00
diff --git a/lib/services/smartling.rb b/lib/services/smartling.rb
@@ -15,7 +15,7 @@ class Service::Smartling < Service
 
   def receive_push
     check_config
-    if data["master_only"] == false || payload["ref"] == "refs/heads/master"
+    if data["master_only"] == nil || data["master_only"] == false || payload["ref"] == "refs/heads/master"
         payload["projectId"] = data["project_id"]
         payload["apiKey"] = data["api_key"]
         payload["resourceFile"] = data["config_path"]
@@ -36,4 +36,4 @@ def check_config
     raise_config_error "Missing path to the project configuration" if data["config_path"].to_s.empty?
   end
 
-end
+end
diff --git a/test/smartling_test.rb b/test/smartling_test.rb
@@ -62,6 +62,29 @@ def test_requires_master_only_no_branch
     @stubs.verify_stubbed_calls
   end
 
+  def test_requires_master_only_nil_master
+    data = self.data.update("master_only" => nil)
+    @stubs.post "/github" do |env|
+      assert_equal "capi.smatling.com", env[:url].host
+      [200, {}, '']
+    end
+    svc = service :push, data, payload
+    svc.receive
+    @stubs.verify_stubbed_calls
+  end
+
+  def test_requires_master_only_nil_branch
+    data = self.data.update("master_only" => nil)
+    payload = self.payload.update("ref" => "refs/heads/branch_name")
+    @stubs.post "/github" do |env|
+      assert_equal "capi.smatling.com", env[:url].host
+      [200, {}, '']
+    end
+    svc = service :push, data, payload
+    svc.receive
+    @stubs.verify_stubbed_calls
+  end
+
   def test_requires_master_only_yes_master
     data = self.data.update("master_only" => true)
     @stubs.post "/github" do |env|
@@ -133,4 +156,4 @@ def data
   def service(*args)
     super Service::Smartling, *args
   end
-end
+end
