Merge pull request #103 from asebastian/0-10-2-api-updates

0 10 2 api updates

Gemfile

@@ -49,7 +49,7 @@ gem 'thin', :group => :development
 
 #testing
 group :test, :development do
-  gem "fake_sensu", "0.1.1"
+  gem "fake_sensu", "0.1.2"
   gem "rspec-rails"
   gem "factory_girl_rails"
   gem "capybara"

Gemfile.lock

@@ -65,7 +65,7 @@ GEM
     factory_girl_rails (4.2.1)
       factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
-    fake_sensu (0.1.1)
+    fake_sensu (0.1.2)
       rest-client
       sinatra
       thin
@@ -208,7 +208,7 @@ DEPENDENCIES
   coffee-rails (~> 3.2.1)
   devise
   factory_girl_rails
-  fake_sensu (= 0.1.1)
+  fake_sensu (= 0.1.2)
   font-awesome-sass-rails
   formtastic
   haml-rails

app/views/events/_actions.html.haml

@@ -1,6 +1,6 @@
 %td{:rel => "#{event.client}_popup_info", :title => "Check Silence", 'data-content' => silenced_output(check_silenced, client_silenced)}
   %div.btn-group
-    %button.btn.btn-info.dropdown-toggle{'data-toggle' => 'dropdown'}
+    %button.btn.btn-info.dropdown-toggle{:id => "dropdown_toggle_#{i}", 'data-toggle' => 'dropdown'}
       %div{:style => "width: 25px"}
         %div{:style => "float: left;"}
           - display_silenced(event, i, client_silenced, check_silenced)
@@ -9,16 +9,16 @@
     %ul.dropdown-menu
       - if client_silenced.nil?
         %li
-          %a.silence-client{:index_id => "#{i}", :misc => "#{event.client}_#{event.check}", :href => "#"} Silence Client
+          %a.silence-client{:id => "silence_client_#{i}", :index_id => "#{i}", :misc => "#{event.client}_#{event.check}", :href => "#"} Silence Client
       - else
         %li
-          %a.unsilence-submit-event{:index_id => "#{i}", :misc => "#{event.client}_#{event.check}", :rel => "/events/#{event.client}/unsilence", :href => "#"} UnSilence Client
+          %a.unsilence-submit-event{:id => "unsilence_client_#{i}", :index_id => "#{i}", :misc => "#{event.client}_#{event.check}", :rel => "/events/#{event.client}/unsilence", :href => "#"} UnSilence Client
       - if check_silenced.nil?
         %li
-          %a.silence-check{:index_id => "#{i}", :misc => "#{event.client}_#{event.check}", :href => "#"} Silence Check
+          %a.silence-check{:id => "silence_check_#{i}", :index_id => "#{i}", :misc => "#{event.client}_#{event.check}", :href => "#"} Silence Check
       - else
         %li
-          %a.unsilence-submit-event{:index_id => "#{i}", :misc => "#{event.client}_#{event.check}", :rel => "/events/#{event.client}/#{event.check}/unsilence", :href => "#"} UnSilence Check
+          %a.unsilence-submit-event{:id => "unsilence_check_#{i}", :index_id => "#{i}", :misc => "#{event.client}_#{event.check}", :rel => "/events/#{event.client}/#{event.check}/unsilence", :href => "#"} UnSilence Check
       %li
         %a.resolve-event{:misc => "#row-event-#{i}", :index_id => "#{i}", :rel => "/events/#{event.client}/#{event.check}/resolve"} Resolve
       %li

spec/features/client_features_spec.rb

@@ -29,7 +29,7 @@
   end
 
   it "should show a client time" do
-    page.should have_content time_ago_in_words(Time.at(1364343737))
+    page.should have_content time_ago_in_words(Time.at(1377890282))
   end
 
 end

spec/features/events_features_spec.rb

@@ -19,26 +19,39 @@
     end
 
     it "should show multiple events", :js => true do
-      page.should have_content "standalone"
-      page.should have_content "tokens"
+      page.should have_content "test"
     end
 
     it "should show the client for an event", :js => true do
       page.should have_content "i-424242"
     end
 
     it "should show the check for an event", :js => true do
-      page.should have_content "standalone"
+      page.should have_content "test"
     end
 
     it "should show the output for an event", :js => true do
-      page.body.should have_content "i-424242 true"
+      page.body.should have_content "Crit i-424242"
     end
 
     it "should show time since issued for an event", :js => true do
-      page.should have_content time_ago_in_words(Time.at(1364343741))
+      page.should have_content time_ago_in_words(Time.at(1377890282))
     end
 
+    it "should allow a check to be silenced", :js => true do
+      page.find("#dropdown_toggle_0").click
+      page.find("#silence_check_0").click
+      reset_fake_sensu!
+    end
+
+    it "should allow a check to be unsilenced", :js => true do
+      page.find("#dropdown_toggle_0").click
+      page.find("#silence_check_0").click
+      visit '/events'
+      page.find("#dropdown_toggle_0").click
+      page.find("#silence_check_0").click
+      reset_fake_sensu!
+    end
   end
 
 end

spec/features/stashes_features_spec.rb

@@ -21,9 +21,9 @@
   end
 
   it "should show stashes and correct data" do
-    page.should have_content "silence/i-424242/tokens"
+    page.should have_content "tester"
     page.should have_content "Never"
-    page.should have_content time_ago_in_words(Time.at(1364332102))
+    page.should have_content "43 years ago"
   end
 
   it "should have a delete link" do

spec/features/stats_features_spec.rb

@@ -33,13 +33,13 @@
 
   it "should show events by check" do
     within("#events-by-check") do
-      page.should have_content "tokens"
+      page.should have_content "test"
     end
   end
 
   it "should show events by environment" do
     within("#events-by-environment") do
-      page.should have_content "2"
+      page.should have_content "1"
     end
   end
 

spec/spec_helper.rb

@@ -30,7 +30,7 @@
 
   RSpec.configure do |config|
     config.before :suite do
-      FakeSensu.start! "0.9.12"
+      FakeSensu.start! "0.10.2"
     end
   end
 

spec/unit/event_spec.rb

@@ -4,19 +4,16 @@
 
   before :each do
     load "#{Rails.root}/db/seeds.rb"
-    # user = FactoryGirl.create(:user)
-    # user.add_role :admin
-    # sign_in_user(user)
   end
 
   it "should return all checks through cache" do
     events = Event.all_with_cache
-    events.count.should eq 2
+    events.count.should eq 1
   end
 
   it "should resolve an event" do
     events = Event.all
-    events.count.should eq 2
+    events.count.should eq 1
     event = events[rand(events.length)]
     event.resolve.should be_true
     # TODO: would be nice if fake_sensu would delete, then switch back after one
@@ -36,9 +33,10 @@
     client = event.client
     check = event.check
     description = "This is a test description, it is long enough"
-    event.check_silenced.should_not eq nil
-    # Event.silence_check(client, check, description, User.first, nil, false, nil)
-    # event.check_silenced.should eq 
+    event.check_silenced.should eq nil
+    Event.silence_check(client, check, description, User.first, nil, false, nil)
+    event.check_silenced.should eq nil
+    reset_fake_sensu!
   end
 
   it "should allow manual resolution of an event" do