add test publish

thachphat · thachphat · commit 2f4526b19b1b · 2016-10-30T12:05:54.000+07:00
diff --git a/Gemfile b/Gemfile
@@ -57,4 +57,5 @@ group :development do
   gem 'spring'
 end
 
-gem 'bootstrap-datepicker-rails'
+gem 'bootstrap-datepicker-rails'
+gem 'faker'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -80,6 +80,8 @@ GEM
     factory_girl_rails (4.7.0)
       factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
+    faker (1.6.6)
+      i18n (~> 0.5)
     ffi (1.9.14)
     font-awesome-rails (4.7.0.0)
       railties (>= 3.2, < 5.1)
@@ -254,6 +256,7 @@ DEPENDENCIES
   capybara
   coffee-rails (~> 4.1.0)
   factory_girl_rails
+  faker
   font-awesome-rails
   font-kit-rails (~> 1.2.0)
   guard-rspec
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ SimpleCov Test Coverage: **Insert percentage or link to report here**
 
 The following **required** functionality is complete:
 
-* [ ] 10 model tests, 2 route tests, 2 controller tests, 2 view tests.
+* [x] 10 model tests, 2 route tests, 2 controller tests, 2 view tests.
 
 #### Events
 
diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb
@@ -1,4 +1,5 @@
 class TicketsController < ApplicationController
+	skip_before_filter :require_login
   def new
     @event = Event.find(params[:event_id])
   end
diff --git a/spec/factories/categories.rb b/spec/factories/categories.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :category do
+  	name 'Entertainment'
+  	initialize_with { Category.find_or_create_by(name: name) }
+  end
+end
diff --git a/spec/factories/events.rb b/spec/factories/events.rb
@@ -1,7 +1,12 @@
+require 'faker'
+
 FactoryGirl.define do
   factory :event do
+  	name { Faker::Name.name }
 		extended_html_description 'description'    
-		venue Venue.new
-		category Category.new
+		venue
+		category
+		is_published true
+		user
   end
 end
diff --git a/spec/factories/regions.rb b/spec/factories/regions.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :region do
+  	name 'Ho Chi Minh'
+  	initialize_with { Region.find_or_create_by(name: name)}
+  end
+end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
@@ -1,7 +1,9 @@
 FactoryGirl.define do
   factory :user do
     email "MyString"
-    password "MyString"
+	  password "MyString"
+	  password_confirmation "MyString"
     name "MyString"
+   	initialize_with { User.find_or_create_by(email: email) }
   end
 end
diff --git a/spec/factories/venues.rb b/spec/factories/venues.rb
@@ -0,0 +1,9 @@
+require 'faker'
+
+FactoryGirl.define do
+  factory :venue do
+  	name { Faker::Name.name }
+  	full_address '123 abc street'
+  	region
+  end
+end
diff --git a/spec/features/events_spec.rb b/spec/features/events_spec.rb
@@ -2,14 +2,14 @@
 
 RSpec.feature "Events", type: :feature do
   scenario "click on event to show event detail" do
-  	event = FactoryGirl.create(:event, name: 'New Event', starts_at: 1.day.ago, ends_at: 2.days.from_now)
+  	event = FactoryGirl.create(:event, starts_at: 1.day.ago, ends_at: 2.days.from_now)
     visit events_path
-    click_link "New Event"
+    click_link event.name
     expect(current_url).to eq event_url(id: event.id)
   end
 
   scenario 'click on book now' do
-  	event = FactoryGirl.create(:event, name: 'New Event', starts_at: 1.day.ago, ends_at: 2.days.from_now, venue: Venue.new)
+  	event = FactoryGirl.create(:event, starts_at: 1.day.ago, ends_at: 2.days.from_now, venue: Venue.new)
     visit event_path(id: event.id)
     click_link "BOOK NOW"
     expect(current_url).to eq new_event_ticket_url(event_id: event.id)
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
@@ -7,59 +7,54 @@
     end
 
     it "return [] when there are only past events" do
-    	Event.create!(starts_at: 2.days.ago, ends_at: 1.day.ago, extended_html_description: " a past event",
-                venue: Venue.new, category: Category.new)
+        FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.ago)
     	expect(Event.upcoming).to eq []
     end
 
     it "return [b] when there are a past event 'a' and a future event 'b'" do
-    	venue = Venue.new
-    	category = Category.new
-    	a = Event.create!(starts_at: 2.days.ago, ends_at: 1.day.ago, extended_html_description: " a past event",
-                venue: venue, category: category, name: 'a')
-    	b = Event.create!(starts_at: 2.days.ago, ends_at: 1.day.from_now, extended_html_description: " a future event",
-                venue: venue, category: category, name: 'b')
+    	a = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.ago)
+    	b = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now)
     	expect(Event.upcoming).to eq [b]
     end
 
     it "return [b] when there are 2 future events [a, b] and search for b" do
-        venue = Venue.new
-        category = Category.new
-        a = Event.create!(starts_at: 2.days.ago, ends_at: 1.day.from_now, extended_html_description: " a past event",
-                venue: venue, category: category, name: 'a')
-        b = Event.create!(starts_at: 2.days.ago, ends_at: 1.day.from_now, extended_html_description: " a future event",
-                venue: venue, category: category, name: 'b')
+        a = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now)
+        b = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now)
         expect(Event.upcoming(b.name)).to eq [b]
     end
 
     it "return [] when there are 2 future events [a, b] and search for c" do
-        venue = Venue.new
-        category = Category.new
-        a = Event.create!(starts_at: 2.days.ago, ends_at: 1.day.from_now, extended_html_description: " a past event",
-                venue: venue, category: category, name: 'a')
-        b = Event.create!(starts_at: 2.days.ago, ends_at: 1.day.from_now, extended_html_description: " a future event",
-                venue: venue, category: category, name: 'b')
+        a = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now, name: 'a')
+        b = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now, name: 'b')
         expect(Event.upcoming('c')).to eq []
     end
 
     it "return [aaa] when there are 2 future events [aaa, bbb] and search for a" do
-        venue = Venue.new
-        category = Category.new
-        a = Event.create!(starts_at: 2.days.ago, ends_at: 1.day.from_now, extended_html_description: " a past event",
-                venue: venue, category: category, name: 'aaa')
-        b = Event.create!(starts_at: 2.days.ago, ends_at: 1.day.from_now, extended_html_description: " a future event",
-                venue: venue, category: category, name: 'bbb')
+        a = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now, name: 'aaa')
+        b = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now, name: 'bbb')
         expect(Event.upcoming('a')).to eq [a]
     end
 
     it "return [aaa, baa] when there are 2 future events [aaa, baa] and search for a" do
-        venue = Venue.new
-        category = Category.new
-        a = Event.create!(starts_at: 2.days.ago, ends_at: 1.day.from_now, extended_html_description: " a past event",
-                venue: venue, category: category, name: 'aaa')
-        b = Event.create!(starts_at: 2.days.ago, ends_at: 1.day.from_now, extended_html_description: " a future event",
-                venue: venue, category: category, name: 'baa')
+        a = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now, name: 'aaa')
+        b = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now, name: 'baa')
         expect(Event.upcoming('a')).to eq [a, b]
     end
+
+    it 'return [] when user create new event a and not publish' do
+        a = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now, is_published: false)
+        expect(Event.upcoming).to eq []
+    end
+
+    it 'return [a] when user create new event a and published' do
+        a = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now, is_published: true)
+        expect(Event.upcoming).to eq [a]
+    end
+
+    it 'return [a] when user create new events a published and b not published' do
+        a = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now, is_published: true)
+        b = FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now, is_published: false)
+        expect(Event.upcoming).to eq [a]
+    end
   end
 end
diff --git a/spec/requests/events_spec.rb b/spec/requests/events_spec.rb
@@ -3,10 +3,8 @@
 RSpec.describe "Events", type: :request do
   describe "GET /events" do
     it "accepts search on the homepage" do
-      a = Event.create!(name: "Dam Vinh Hung's concert", starts_at: 2.days.ago, ends_at: 1.day.ago, extended_html_description: "a past event",
-                    venue: Venue.new, category: Category.new)
-      b = Event.create!(name: "Scorpion in Vietnam", starts_at: 2.days.ago, ends_at: 1.day.from_now, extended_html_description: " a future event",
-                    venue: Venue.new, category: Category.new)
+      FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.ago, name: "Dam Vinh Hung's concert")
+      FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now, name: 'Scorpion in Vietnam')
 
       get root_path(search: "Scorpion")
       expect(response).to have_http_status(200)
@@ -15,8 +13,7 @@
     end
 
     it 'routes /?search= to events#index' do
-      b = Event.create!(name: "Scorpion in Vietnam", starts_at: 2.days.ago, ends_at: 1.day.from_now, extended_html_description: " a future event",
-                    venue: Venue.new, category: Category.new)
+      FactoryGirl.create(:event, starts_at: 2.days.ago, ends_at: 1.day.from_now, name: 'Scorpion in Vietnam')
 
       get root_path(search: "Scorpion")
       expect(response).to have_http_status(200)
diff --git a/spec/support/spec_test_helper.rb b/spec/support/spec_test_helper.rb
@@ -0,0 +1,14 @@
+module SpecTestHelper
+  def login(user = User.new)
+    request.session[:user_id] = user.id
+  end
+
+  def current_user
+    User.find(request.session[:user_id])
+  end
+end
+
+# spec/spec_helper.rb
+RSpec.configure do |config|
+  config.include SpecTestHelper, :type => :controller
+end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`class TicketsController < ApplicationController`
	`2`	`+ skip_before_filter :require_login`
`2`	`3`	`def new`
`3`	`4`	`@event = Event.find(params[:event_id])`
`4`	`5`	`end`