rearview 1.0.3.rc.1-jruby → 1.0.3.rc.2-jruby

data/spec/lib/rearview/alerts/campfire_alert_spec.rb

@@ -6,20 +6,13 @@ describe Rearview::Alerts::CampfireAlert do
 
   context "alert" do
     context "valid key" do
-      let(:job) { stub(alert_keys: ["alert_key"], app_id: 1, id: 42) }
-      let(:params) { { "room" => "nyan" } }
-
-      before(:each ) do
-        Rearview::Alerts::CampfireAlert.expects(:params).with("alert_key").returns(params)
-        Rearview::Alerts::CampfireAlert.expects(:key?).returns(true)
-        Broach.expects(:settings=).with(params)
-      end
+      let(:job) { FactoryGirl.create(:job, alert_keys: ["campfire://mycompany.com?token=abc&room=myroom"]) }
 
       context "with provided error message" do
         let(:result) { { message: "alert alert!"} }
 
         it "notifies campfire" do
-          Broach.expects(:speak).with("nyan", "alert alert! #{Rearview::UrlHelper.job_url(job)}")
+          Broach.expects(:speak).with("myroom", "alert alert! #{Rearview::UrlHelper.job_url(job)}")
           campfire_alert.alert(job, result)
         end
       end
@@ -28,7 +21,7 @@ describe Rearview::Alerts::CampfireAlert do
         let(:result) { { } }
 
         it "notifies campfire" do
-          Broach.expects(:speak).with("nyan", "Job did not provide an error description #{Rearview::UrlHelper.job_url(job)}")
+          Broach.expects(:speak).with("myroom", "Job did not provide an error description #{Rearview::UrlHelper.job_url(job)}")
           campfire_alert.alert(job, result)
         end
       end

data/spec/lib/rearview/url_helper_spec.rb

@@ -1,11 +1,32 @@
 require 'spec_helper'
 
 describe Rearview::UrlHelper do
-  let(:job) { stub(app_id: 1234, id: 42) }
   subject { Rearview::UrlHelper }
-  context ".rearview_uri" do
-    it "returns rearview uri" do
-      subject.job_url(job).should eq("http://#{Rearview.config.default_url_options[:host]}:#{Rearview.config.default_url_options[:port]}/rearview/#dash/1234/expand/42")
+  context ".job_url" do
+    context "job in dashboard with parent" do
+      it "generates the correct url" do
+        dashboard_child = FactoryGirl.create(:dashboard,parent: FactoryGirl.create(:dashboard))
+        job = FactoryGirl.create(:job,app_id: dashboard_child.id)
+        expected_url = "http://%s:%s/rearview/#dash/%s/expand/%s" % [
+          Rearview.config.default_url_options[:host],
+          Rearview.config.default_url_options[:port],
+          dashboard_child.parent_id,
+          job.id
+        ]
+        expect(subject.job_url(job)).to eq(expected_url)
+      end
+    end
+    context "job in dashboard without parent" do
+      it "generates the correct url" do
+        job = FactoryGirl.create(:job)
+        expected_url = "http://%s:%s/rearview/#dash/%s/expand/%s" % [
+          Rearview.config.default_url_options[:host],
+          Rearview.config.default_url_options[:port],
+          job.app_id,
+          job.id
+        ]
+        expect(subject.job_url(job)).to eq(expected_url)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rearview
 version: !ruby/object:Gem::Version
-  version: 1.0.3.rc.1
+  version: 1.0.3.rc.2
 platform: jruby
 authors:
 - Trent Albright
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails