flyboy 1.0.7 → 1.1.0

data/spec/factories/flyboy_goals.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :flyboy_goal, class: Flyboy::Goal do
-    title { "I-am-a-goal_#{Kernel.rand(0..9999)}" }
+    name        { "I-am-a-goal_#{Kernel.rand(0..9999)}" }
     description { "I-am-the-goal-description_#{Kernel.rand(0..9999)}" }
-    status "open"
+    status      { "open" }
   end
 end

data/spec/factories/flyboy_tasks.rb

@@ -1,8 +1,8 @@
 FactoryGirl.define do
   factory :flyboy_task, class: Flyboy::Task do
-    goal { FactoryGirl.create(:flyboy_goal) }
+    taskable { create(:flyboy_goal) }
 
-    title       { "I-am-a-task#{Kernel.rand(0..9999)}"                }
+    name        { "I-am-a-task#{Kernel.rand(0..9999)}"                }
     description { "I-am-the-task-description_#{Kernel.rand(0..9999)}" }
     reminder "2013-08-27"
     term "2013-08-27"

data/spec/helpers/flyboy/application_helper_spec.rb

@@ -21,17 +21,17 @@ describe Flyboy::ApplicationHelper, type: :helper do
       FactoryGirl.create(:flyboy_goal)
     }
     let!(:task_onalert_for_other_goal) {
-      FactoryGirl.create(:flyboy_task, goal: other_goal, reminder: Date.today - 3.days, term: Date.today - 1.day, done: false)
+      FactoryGirl.create(:flyboy_task, taskable: other_goal, reminder: Date.today - 3.days, term: Date.today - 1.day, done: false)
     }
     let!(:task_onwarning_for_other_goal) {
-      FactoryGirl.create(:flyboy_task, goal: other_goal, reminder: Date.today - 3.days, term: Date.today + 1.day, done: false)
+      FactoryGirl.create(:flyboy_task, taskable: other_goal, reminder: Date.today - 3.days, term: Date.today + 1.day, done: false)
     }
 
     let!(:task_ontime) {
-      FactoryGirl.create(:flyboy_task, goal: goal, reminder: Date.today + 1.day, term: Date.today + 3.days, done: false)
+      FactoryGirl.create(:flyboy_task, taskable: goal, reminder: Date.today + 1.day, term: Date.today + 3.days, done: false)
     }
     let!(:task_finished) {
-      FactoryGirl.create(:flyboy_task, goal: goal, reminder: Date.today - 3.days, term: Date.today - 1.day, done: true)
+      FactoryGirl.create(:flyboy_task, taskable: goal, reminder: Date.today - 3.days, term: Date.today - 1.day, done: true)
     }
 
     context 'when all tasks are ontime or finished' do
@@ -49,14 +49,14 @@ describe Flyboy::ApplicationHelper, type: :helper do
     end
 
     context 'when at least one task is on warning' do
-      let!(:task_onwarning) {FactoryGirl.create(:flyboy_task, goal: goal, reminder: Date.today - 3.days, term: Date.today + 1.day, done: false)}
+      let!(:task_onwarning) {FactoryGirl.create(:flyboy_task, taskable: goal, reminder: Date.today - 3.days, term: Date.today + 1.day, done: false)}
       it 'should return onwarning' do
         goal_color(goal).should eq('onwarning')
       end
     end
 
     context 'when at least one task is on alert' do
-      let!(:task_onwarning) {FactoryGirl.create(:flyboy_task, goal: goal, reminder: Date.today - 3.days, term: Date.today - 1.day, done: false)}
+      let!(:task_onwarning) {FactoryGirl.create(:flyboy_task, taskable: goal, reminder: Date.today - 3.days, term: Date.today - 1.day, done: false)}
 
       it 'should return onalert' do
         goal_color(goal).should eq('onalert')

data/spec/models/flyboy/ability_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Flyboy::Ability do
   let(:ability){
-    Flyboy::Ability.new
+    Ability.new
   }
 
   describe Flyboy::Goal do
@@ -55,7 +55,7 @@ describe Flyboy::Ability do
 
     it "can't close goals with undone tasks" do
       task = FactoryGirl.create(:flyboy_task, done: false)
-      goal = task.goal
+      goal = task.taskable
       expect(ability.can?(:close, goal)).to be false
     end
 
@@ -89,25 +89,25 @@ describe Flyboy::Ability do
 
     it "can update task in an open goal" do
       goal = FactoryGirl.create(:flyboy_goal, status: "open")
-      task = FactoryGirl.create(:flyboy_task, goal: goal)
+      task = FactoryGirl.create(:flyboy_task, taskable: goal)
       expect(ability.can?(:update, task)).to be true
     end
 
     it "can't update task in an closed goal" do
       goal = FactoryGirl.create(:flyboy_goal, status: "closed")
-      task = FactoryGirl.create(:flyboy_task, goal: goal)
+      task = FactoryGirl.create(:flyboy_task, taskable: goal)
       expect(ability.can?(:update, task)).to be false
     end
 
     it "can delete task in an open goal" do
       goal = FactoryGirl.create(:flyboy_goal, status: "open")
-      task = FactoryGirl.create(:flyboy_task, goal: goal)
+      task = FactoryGirl.create(:flyboy_task, taskable: goal)
       expect(ability.can?(:delete, task)).to be true
     end
 
     it "can't delete task in an closed goal" do
       goal = FactoryGirl.create(:flyboy_goal, status: "closed")
-      task = FactoryGirl.create(:flyboy_task, goal: goal)
+      task = FactoryGirl.create(:flyboy_task, taskable: goal)
       expect(ability.can?(:delete, task)).to be false
     end
 
@@ -135,6 +135,14 @@ describe Flyboy::Ability do
       task = FactoryGirl.create(:flyboy_task, reminder: Date.today, term: Date.tomorrow)
       expect(ability.can?(:snooze, task)).to be false
     end
+
+    it "can't create a task if it can't read taskable" do
+      class DummyObject; end
+      task = build(:flyboy_task)
+      def task.taskable; DummyObject.new; end
+
+      expect(ability.can?(:create, task)).to be false
+    end
   end
 
 end

data/spec/models/flyboy/goal_spec.rb

@@ -4,7 +4,7 @@ describe Flyboy::Goal do
   it { should have_many(:tasks).dependent(:destroy) }
 
   describe '#validation' do
-    it { should validate_presence_of :title }
+    it { should validate_presence_of :name }
 
     it "should validate the goal when not step is assigned" do
       goal = FactoryGirl.build(:flyboy_goal)
@@ -47,8 +47,8 @@ describe Flyboy::Goal do
   describe "#progress" do
     it "update task should update goal progress" do
       goal  = FactoryGirl.create(:flyboy_goal)
-      task1 = FactoryGirl.create(:flyboy_task, goal: goal, progress: 50)
-      task2 = FactoryGirl.create(:flyboy_task, goal: goal, progress: 100)
+      task1 = FactoryGirl.create(:flyboy_task, taskable: goal, progress: 50)
+      task2 = FactoryGirl.create(:flyboy_task, taskable: goal, progress: 100)
       expect(goal.reload.progress).to eq 75
       task1.progress = 100
       task1.save
@@ -57,7 +57,7 @@ describe Flyboy::Goal do
 
    it "delete task should update goal progress" do
       goal  = FactoryGirl.create(:flyboy_goal)
-      task1 = FactoryGirl.create(:flyboy_task, goal: goal, progress: 50)
+      task1 = FactoryGirl.create(:flyboy_task, taskable: goal, progress: 50)
       expect(goal.reload.progress).to eq 50
       task1.destroy
       expect(goal.reload.progress).to eq 0
@@ -87,14 +87,14 @@ describe Flyboy::Goal do
 
     it "open goal with undone tasks can't be closed" do
       goal = FactoryGirl.create(:flyboy_goal, status: "open")
-      task = FactoryGirl.create(:flyboy_task, goal: goal, done: false)
+      task = FactoryGirl.create(:flyboy_task, taskable: goal, done: false)
       expect(goal.close).to be false
       expect(goal.status).to eq "open"
     end
 
     it "open goal with all tasks done can be closed" do
       goal = FactoryGirl.create(:flyboy_goal, status: "open")
-      task = FactoryGirl.create(:flyboy_task, goal: goal, done: true)
+      task = FactoryGirl.create(:flyboy_task, taskable: goal, done: true)
       expect(goal.close).to be true
       expect(goal.status).to eq "closed"
     end