starburst 0.9.3 → 1.0.0

data/spec/factories/announcement_views.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do 
+        factory :announcement_view, class: Starburst::AnnouncementView do
+        	
+        end
+end

data/spec/features/announcements_spec.rb

@@ -2,35 +2,33 @@ require 'spec_helper'
 
 feature 'Announcements' do
 	scenario 'show announcement to user' do
-		#@user = FactoryGirl.create(:user)
-		#login_as(@user, :scope => :user, :run_callbacks => false)
 		@current_user = FactoryGirl.create(:user)
 		ActionController::Base.any_instance.stub(:current_user).and_return(@current_user)
 		ActionView::Base.any_instance.stub(:current_user).and_return(@current_user)
-		announcement = FactoryGirl.create(:announcement, :body => "My announcement")
+		FactoryGirl.create(:announcement, :body => "My announcement")
 		visit root_path
 		page.should have_content "My announcement"
 	end
 	scenario 'show no announcements if user not logged in' do
 		ActionController::Base.any_instance.stub(:current_user).and_return(nil)
 		ActionView::Base.any_instance.stub(:current_user).and_return(nil)
-		announcement = FactoryGirl.create(:announcement, :body => "My announcement")
+		FactoryGirl.create(:announcement, :body => "My announcement")
 		visit root_path
 		page.should_not have_content "My announcement"
 		page.should have_content "Sample homepage"
 	end
-	scenario 'mark announcement as read then hide it from now on' do
-		pending
-		@user = FactoryGirl.create(:user)
-		login_as(@user, :scope => :user, :run_callbacks => false)
-		#ActionView::Base.any_instance.stub(:current_user).and_return(@current_user)
-		#ActionController::Base.any_instance.stub(:current_user).and_return(@current_user)
+	scenario 'stop showing announcement once the user has read it' do
+		@current_user = FactoryGirl.create(:user)
+		ActionController::Base.any_instance.stub(:current_user).and_return(@current_user)
+		ActionView::Base.any_instance.stub(:current_user).and_return(@current_user)
 		announcement = FactoryGirl.create(:announcement, :body => "My announcement")
 		visit root_path
 		page.should have_content "My announcement"
-		click_link "starburst-close"
-		wait_for_ajax
+		FactoryGirl.create(:announcement_view, :user => @current_user, :announcement => announcement)
 		visit root_path
 		page.should_not have_content "My announcement"
 	end
-end
+	scenario 'allow the user to click to hide the announcement' do
+		pending "Figure out how to best stub the current_user method for a JavaScript-enabled test"
+	end
+end

data/spec/models/starburst/announcement_spec.rb

@@ -6,6 +6,10 @@ describe Announcement do
 
   context "a basic announcement" do
 
+    it "can't be created without a body" do
+      expect(Announcement.create(:body => nil)).to have(1).error_on(:body)
+    end
+
     it "can be created with just a body" do
       expect(Announcement.create(:body => "This is an announcement.")).to be_valid
     end
@@ -19,32 +23,32 @@ describe Announcement do
   context "a scheduled annoucement" do
 
     it "does not show up past its end date" do
-      Announcement.create(:stop_delivering_at => 1.day.ago)
+      Announcement.create(:body => "test", :stop_delivering_at => 1.day.ago)
       expect(Announcement.current.blank?).to eq true
     end
 
     it "shows before its end date" do
-      Announcement.create(:stop_delivering_at => Time.now + 1.day)
+      Announcement.create(:body => "test", :stop_delivering_at => Time.now + 1.day)
       expect(Announcement.current.present?).to eq true
     end
 
     it "does not show up before its start date" do
-      Announcement.create(:start_delivering_at => Time.now + 1.day)
+      Announcement.create(:body => "test", :start_delivering_at => Time.now + 1.day)
       expect(Announcement.current.blank?).to eq true
     end
 
     it "shows after its start date" do
-      Announcement.create(:start_delivering_at => 1.day.ago)
+      Announcement.create(:body => "test", :start_delivering_at => 1.day.ago)
       expect(Announcement.current.present?).to eq true
     end
 
     it "shows up between its start and end dates" do
-      Announcement.create(:start_delivering_at => Time.now, :stop_delivering_at => Time.now + 1.day)
+      Announcement.create(:body => "test", :start_delivering_at => Time.now, :stop_delivering_at => Time.now + 1.day)
       expect(Announcement.current.present?).to eq true
     end
 
     it "does not show when its start and end dates are the same" do
-      Announcement.create(:start_delivering_at => Time.now, :stop_delivering_at => Time.now)
+      Announcement.create(:body => "test", :start_delivering_at => Time.now, :stop_delivering_at => Time.now)
       expect(Announcement.current.blank?).to eq true
     end
 
@@ -53,16 +57,16 @@ describe Announcement do
   context "an announcement not yet read by the current user" do
 
     it "shows up" do
-      read_announcement = Announcement.create(:start_delivering_at => 1.day.ago)
-      unread_announcement = Announcement.create(:start_delivering_at => Time.now)
+      read_announcement = Announcement.create(:body => "test", :start_delivering_at => 1.day.ago)
+      unread_announcement = Announcement.create(:body => "test", :start_delivering_at => Time.now)
       user_who_read_announcement = FactoryGirl.create(:user)
       AnnouncementView.create(:announcement => read_announcement, :user => user_who_read_announcement)
       expect(Announcement.unread_by(user_who_read_announcement)).to eq [unread_announcement]
     end
 
     it "shows up for the current user even when others have read it" do
-      read_announcement = Announcement.create(:start_delivering_at => 1.day.ago)
-      unread_announcement = Announcement.create(:start_delivering_at => Time.now)
+      read_announcement = Announcement.create(:body => "test", :start_delivering_at => 1.day.ago)
+      unread_announcement = Announcement.create(:body => "test", :start_delivering_at => Time.now)
       user_who_read_announcement = FactoryGirl.create(:user)
       user_who_read_no_announcements = FactoryGirl.create(:user)
       AnnouncementView.create(:announcement => read_announcement, :user => user_who_read_announcement)
@@ -70,8 +74,8 @@ describe Announcement do
     end
 
   it "shows up for the current user even when they have read other announcements" do
-      read_announcement = Announcement.create(:start_delivering_at => 1.day.ago)
-      unread_announcement = Announcement.create(:start_delivering_at => Time.now)
+      read_announcement = Announcement.create(:body => "test", :start_delivering_at => 1.day.ago)
+      unread_announcement = Announcement.create(:body => "test", :start_delivering_at => Time.now)
       user_who_read_announcement = FactoryGirl.create(:user)
       AnnouncementView.create(:announcement => read_announcement, :user => user_who_read_announcement)
       expect(Starburst::Announcement.current(user_who_read_announcement)).to eq unread_announcement
@@ -82,7 +86,7 @@ describe Announcement do
 
   context "an announcement targeted to certain users" do
     it "has a limited_to_users field that is retrieveable from the database" do
-      limited_announcement = Announcement.create(:limit_to_users => [
+      limited_announcement = Announcement.create(:body => "test", :limit_to_users => [
         {
           :field => "subscription",
           :value => "",
@@ -93,7 +97,7 @@ describe Announcement do
     end
 
     it "shows up for the proper user only (one positive condition)" do
-      limited_announcement = Announcement.create(:limit_to_users => [
+      limited_announcement = Announcement.create(:body => "test", :limit_to_users => [
         {
           :field => "subscription",
           :value => ""
@@ -107,7 +111,7 @@ describe Announcement do
 
     it "shows up for the proper user only (method condition)" do
       Starburst.user_instance_methods = ["free?"]
-      limited_announcement = Announcement.create(:limit_to_users => [
+      limited_announcement = Announcement.create(:body => "test", :limit_to_users => [
         {
           :field => "free?",
           :value => true

data/spec/models/starburst/announcement_view_spec.rb

@@ -0,0 +1,37 @@
+require_relative "../../spec_helper"
+
+module Starburst
+
+describe AnnouncementView do
+
+  it "does not allow a user to mark two views of an announcement" do
+  	user = FactoryGirl.create(:user)
+  	announcement = FactoryGirl.create(:announcement)
+  	view1 = FactoryGirl.create(:announcement_view, :user => user, :announcement => announcement)
+  	view2 = FactoryGirl.build(:announcement_view, :user => user, :announcement => announcement)
+  	expect(view1).to be_valid
+  	expect(view2).to have(1).error_on(:user_id)
+  end
+
+  it "allows a user to log views of different announcements" do
+  	user = FactoryGirl.create(:user)
+  	announcement1 = FactoryGirl.create(:announcement)
+  	announcement2 = FactoryGirl.create(:announcement)
+  	view1 = FactoryGirl.create(:announcement_view, :user => user, :announcement => announcement1)
+  	view2 = FactoryGirl.create(:announcement_view, :user => user, :announcement => announcement2)
+  	expect(view1).to be_valid
+  	expect(view2).to be_valid
+  end
+
+  it "allows multiple users to view the same announcement" do
+  	user1 = FactoryGirl.create(:user)
+  	user2 = FactoryGirl.create(:user)
+  	announcement = FactoryGirl.create(:announcement)
+  	view1 = FactoryGirl.create(:announcement_view, :user => user1, :announcement => announcement)
+  	view2 = FactoryGirl.create(:announcement_view, :user => user2, :announcement => announcement)
+  	expect(view1).to be_valid
+  	expect(view2).to be_valid
+  end
+
+end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: starburst
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Corey Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -116,6 +116,7 @@ files:
 - config/routes.rb
 - db/migrate/20141004214002_create_announcement_tables.rb
 - db/migrate/20141112140703_add_category_to_starburst_announcements.rb
+- db/migrate/20141209221904_add_index_and_uniqueness_to_announcement_views.rb
 - lib/helpers/starburst/configuration.rb
 - lib/starburst/engine.rb
 - lib/starburst/version.rb
@@ -179,10 +180,12 @@ files:
 - spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994
 - spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
 - spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
+- spec/factories/announcement_views.rb
 - spec/factories/announcements.rb
 - spec/factories/users.rb
 - spec/features/announcements_spec.rb
 - spec/models/starburst/announcement_spec.rb
+- spec/models/starburst/announcement_view_spec.rb
 - spec/spec_helper.rb
 - spec/support/wait_for_ajax.rb
 homepage: http://github.com/csm123/starburst
@@ -266,10 +269,12 @@ test_files:
 - spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994
 - spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
 - spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
+- spec/factories/announcement_views.rb
 - spec/factories/announcements.rb
 - spec/factories/users.rb
 - spec/features/announcements_spec.rb
 - spec/models/starburst/announcement_spec.rb
+- spec/models/starburst/announcement_view_spec.rb
 - spec/spec_helper.rb
 - spec/support/wait_for_ajax.rb
 has_rdoc: