adminpanel 1.2.12 → 2.0.0

data/spec/features/authentication_pages_spec.rb

@@ -1,11 +1,10 @@
 require 'spec_helper'
-require 'support/test_database'
 
 describe "Authentication" do
 
-  	subject { page }
+	subject { page }
 
-	describe "sign in page" do
+	describe 'sign in page' do
 	    before { visit adminpanel.signin_path }
 
 	    it { should have_content(I18n.t("authentication.welcome")) }
@@ -13,28 +12,29 @@ describe "Authentication" do
 	    it { expect(page).to have_title(I18n.t("Panel title")) }
 	end
 
-    describe "signin" do
+    describe 'signin' do
 	    before { visit adminpanel.signin_path }
 
-	    describe "with invalid information" do
-	      	before { click_button "signin-button" }
+	    describe 'with invalid information' do
+      	before do
+          click_button 'signin-button'
+        end
 
 	    	it { expect(page).to have_title(I18n.t("Panel title")) }
-
-	      	it { should have_selector('div.alert.alert-error', :text => I18n.t("authentication.signin_error")) }
+      	it { should have_selector('div.alert.alert-error', :text => I18n.t('authentication.signin_error')) }
 	    end
 
-	    describe "with valid information" do
-	    	let(:user) { Factory(:user) }
+	    describe 'with valid information' do
+	    	let(:user) { FactoryGirl.build(:user) }
 	    	before do
-	    		valid_signin(user)
+	    		valid_signin_as_admin(user)
 	    	end
 
-	    	it { should have_selector('div.alert.alert-success', :text => I18n.t("authentication.signin_success")) }
-	    	it { should have_selector('i.icon-off') }
+	    	it { should have_selector('div.alert.alert-success', :text => I18n.t('authentication.signin_success')) }
+	    	it { should have_selector('i.fa-power-off') }
 
-	    	describe "signing out" do
-	    		before { click_link "signout-button"}
+	    	describe 'signing out' do
+	    		before { click_link 'signout-button'}
 
 	    		it { current_path.should == adminpanel.signin_path }
 	    		it { expect(page).to have_title(I18n.t("Panel title")) }

data/spec/features/galleries_pages_spec.rb

@@ -1,41 +1,50 @@
 require 'spec_helper'
-require 'support/test_database'
 
+describe 'Gallery pages' do
+	let(:gallery) { FactoryGirl.build(:gallery) }
+	let(:user) { FactoryGirl.build(:user) }
 
-describe "Gallery pages" do
-	subject {page}
+	subject { page }
 
-	let(:user) { Factory(:user) }
 	before do
+		gallery.save
 		visit adminpanel.signin_path
-		valid_signin(user)
+		valid_signin_as_admin(user)
 		clean_uploads_folder
 	end
 
-	describe "galleries" do
-		let(:gallery) { Factory(:gallery) }
+	describe 'galleries' do
 		before do
 			visit adminpanel.galleries_path
 		end
 
-		it { should have_link(I18n.t("gallery.new"), adminpanel.new_gallery_path)}
-		it { should have_link("i", adminpanel.gallery_path(gallery)) }
-		it { should have_link("i", adminpanel.edit_gallery_path(gallery)) }
-		it { should have_link("i", adminpanel.move_to_better_gallery_path(gallery)) }
-		it { should have_link("i", adminpanel.move_to_worst_gallery_path(gallery)) }
+		it { should have_link(I18n.t('gallery.new'), adminpanel.new_gallery_path)}
+		it { should have_link('i', adminpanel.gallery_path(gallery)) }
+		it { should have_link('i', adminpanel.edit_gallery_path(gallery)) }
+		it { should have_link('i', adminpanel.move_to_better_gallery_path(gallery)) }
+		it { should have_link('i', adminpanel.move_to_worst_gallery_path(gallery)) }
 	end
 
-	describe "when creating" do
-		describe "a single image" do
-			let(:gallery) { Factory(:gallery)}
-			it { gallery.position.should eq 1 }
+	context 'when creating' do
+    let(:gallery_1) { FactoryGirl.build(:gallery) }
+    let(:gallery_2) { FactoryGirl.build(:gallery) }
+    let(:gallery_3) { FactoryGirl.build(:gallery) }
+
+		before do
+			Adminpanel::Gallery.delete_all
+			gallery_1.save
 		end
 
-		describe "3 images" do
-			let!(:gallery_1) { Factory(:gallery) }
-			let!(:gallery_2) { Factory(:gallery) }
-			let!(:gallery_3) { Factory(:gallery) }
+		describe 'a single image' do
+			it { gallery_1.position.should eq 1 }
+		end
 
+		describe '3 images' do
+
+			before do
+				gallery_2.save
+				gallery_3.save
+			end
 			it { gallery_2.position.should eq 2 }
 			it { gallery_3.position.should eq 3 }
 			describe "when moving down the image in position 1" do
@@ -92,11 +101,10 @@ describe "Gallery pages" do
 	end
 
 	describe "show" do
-		let(:gallery) { Factory(:gallery) }
 		before do
 			visit adminpanel.gallery_path(gallery)
 		end
 
-		it { page.should have_selector("img", :src => gallery.file_url) }
+		it { page.should have_selector("img[src='#{gallery.file_url(:thumb)}']") }
 	end
 end

data/spec/features/section_pages_spec.rb

@@ -1,39 +1,36 @@
 require 'spec_helper'
-require 'support/test_database'
 
-describe "Section pages" do
-	subject {page}
 
-	let(:user) { Factory(:user) }
+describe 'Section pages' do
+	subject { page }
+
+	let(:user) { get_user }
 	before do
+		Adminpanel::Section.delete_all
 		visit adminpanel.signin_path
-		valid_signin(user)
+		valid_signin_as_admin(user)
 	end
 
-	describe "index" do
-		let(:section) { Factory(:section_with_gallery) }
+	describe 'index' do
+		let!(:section) { FactoryGirl.create(:section_with_gallery) }
 		before do
 			visit adminpanel.sections_path
 		end
 
-		it { should have_link("i", adminpanel.section_path(section)) }
-		it { should have_link("i", adminpanel.edit_section_path(section)) }
+		it { should have_link('i', adminpanel.section_path(section)) }
+		it { should have_link('i', adminpanel.edit_section_path(section)) }
 	end
 
-	describe "show" do
-		describe "with gallery" do
-			let(:section) { Factory(:section_with_gallery) }
-			let(:image) { Factory(:image_section, :section_id => section.id) }
-			# let(:image2) { Factory(:image_section, :foreign_key => section.id) }
-			# let(:image3) { Factory(:image_section, :foreign_key => section.id) }
+	describe 'show' do
+		describe 'with gallery' do
+			let(:section) { FactoryGirl.create(:section_with_gallery) }
 
 			before do
 				visit adminpanel.section_path(section)
 			end
 
-		    it { should have_title(section.name.humanize) }
-		    it { should have_content(section.description) }
-			it { should have_link("i", adminpanel.edit_section_path(section)) }
+	    it { should have_content(section.description) }
+			it { should have_link('i', adminpanel.edit_section_path(section)) }
 		end
 	end
 end

data/spec/features/shared_pages_spec.rb

@@ -1,158 +1,128 @@
 require 'spec_helper'
-require 'support/test_database'
 
-describe 'shared pages' do
+describe 'Shared pages' do
 	subject { page }
 
-	let(:user) { Factory(:user) }
+
+	let(:user) { get_user }
+	let!(:product) { FactoryGirl.create(:product) }
+	let!(:category){ FactoryGirl.create(:category) }
+	let!(:photo) { FactoryGirl.create(:photo) }
+	let!(:mug) { FactoryGirl.create(:mug) }
+
 	before do
+		Adminpanel::User.delete_all
 		visit adminpanel.signin_path
-		valid_signin(user)
+		valid_signin_as_admin(user)
 	end
 
-	context 'when visiting' do
-		describe 'index' do
-			let(:product) { Factory(:product) }
-			before do
-				visit adminpanel.products_path
-			end
+	after do
+		Adminpanel::User.delete_all
+	end
 
-			it { should have_link(Adminpanel::Product.display_name, adminpanel.new_product_path)}
-			it { should have_link('i', adminpanel.product_path(product)) }
-			it { should have_link('i', adminpanel.edit_product_path(product)) }
+	describe 'mugs#index excluding every rest action but index' do
+		before do
+			visit adminpanel.mugs_path
 		end
 
-		context 'product' do
-
-			describe 'new' do
-				let(:category){ Factory(:category) }
-				before do
-					category.id = 1 #to force instantiation and id.
-					visit adminpanel.new_product_path
-				end
-
-				it { should have_title(I18n.t("action.create") + " " + Adminpanel::Product.display_name) }
-
-				it 'should have add remote category button' do
-					should have_selector(
-						'a.btn-info',
-						:text => I18n.t(
-							'other.add',
-							:model => Adminpanel::Category.display_name
-						)
-					)
-				end
-
-				describe 'submtting with invalid information' do
-					before do
-						find("form#new_resource").submit_form!
-					end
-
-					it { should have_title(I18n.t("action.create") + " " + Adminpanel::Product.display_name) }
-					it { should have_selector("div#alerts") }
-				end
-
-				# describe 'opening the remote form modal' do
-				# 	before do
-				# 		page.find("a##{Adminpanel::Category.name.demodulize.downcase}-modal-link").click
-				# 	end
-				#
-				# 	it 'should have modal with correct #modal-title' do
-				# 		page.should have_selector(
-				# 		:css,
-				# 		'h3#modal-title',
-				# 		:content => I18n.t('other.add', :model => Adminpanel::Category.display_name)
-				# 		)
-				# 	end
-				#
-				# 	it 'should have the modal with the correct fields' do
-				# 		should have_selector("input#category_name")
-				# 	end
-
-					# describe 'sending the resource remotely with invalid information' do
-					# 	before do
-					# 		find('#new-Category-button').click
-					# 	end
-					# 	it 'should display error message' do
-					# 		page.should have_selector("div#alerts")
-					# 	end
-					# end
-
-				# end
-
-				describe 'submitting with valid information' do
-					before do
-						fill_in "product_name", :with => "product name"
-						fill_in "product_price", :with => "855.5"
-						find(:css, "#product_category_ids_[value='1']").set(true)
-						find(:xpath, "//input[@id='description-field']").set "<p>a little longer text</p>"
-						find("form#new_resource").submit_form!
-					end
-
-					it { should have_content(I18n.t("action.save_success"))}
-					it { Adminpanel::Categorization.count.should equal(1)}
-				end
-			end
+		it 'should not have create mug button' do
+			should_not have_link('a', href:'/adminpanel/tazas/new')
+		end
+		it 'should not have show or destroy button' do
+			should_not have_link('a', href:'/adminpanel/tazas/1')
+		end
+		it 'should not have edit button' do
+			should_not have_link('a', href:'/adminpanel/tazas/1/edit')
 		end
+	end
 
-		describe "edit" do
-			let(:category){ Factory(:category) }
-			let(:product){ Factory(:product) }
 
-			before do
-				category.id = 1 #to force instantiation and id.
-				product.category_ids = ["1"]
-				visit adminpanel.edit_product_path(product)
-			end
+	describe 'index' do
+		before do
+			visit adminpanel.products_path
+		end
 
-			it { should have_title(I18n.t("action.update") + " " + Adminpanel::Product.display_name) }
+		it { should have_link(Adminpanel::Product.display_name, adminpanel.new_product_path)}
+		it { should have_link('i', adminpanel.product_path(product)) }
+		it { should have_link('i', adminpanel.edit_product_path(product)) }
+	end
 
-			describe "with invalid information" do
-				before do
-					fill_in "product_name", :with => ""
-					fill_in "product_price", :with => ""
-					find("form#edit_resource").submit_form!
-				end
+	describe 'new' do
+		before do
+			visit adminpanel.new_product_path
+		end
 
-				it { should have_title(I18n.t("action.update") + " " + Adminpanel::Product.display_name) }
-				it { should have_selector("div#alerts") }
-			end
+		it 'should have add remote category button' do
+			should have_selector(
+				'a.btn-info',
+				:text => I18n.t(
+					'other.add',
+					:model => Adminpanel::Category.display_name
+				)
+			)
+		end
 
-			describe "with same information" do
-				before do
-					find("form#edit_resource").submit_form!
-				end
 
-				it { should have_content(I18n.t("action.save_success"))}
+		describe 'submtting with invalid information' do
+			before do
+				find("#new-Product-button").click
 			end
 
-			describe "with valid information" do
-				before do
-					find(:css, "#product_category_ids_[value='1']").set(true)
-					fill_in "product_name", :with => "product name"
-					fill_in "product_price", :with => "855.5"
-					find(:xpath, "//input[@id='description-field']").set "<p>a little longer text</p>"
-					find("form#edit_resource").submit_form!
-				end
-
-				it { should have_content(I18n.t("action.save_success"))}
+			it { should have_title(I18n.t("action.create") + " " + Adminpanel::Product.display_name) }
+			it 'should stay in products#new' do
+				current_url.should eq adminpanel.new_product_url
 			end
 		end
 
-		describe "show" do
-			let(:product) { Factory(:product) }
-			let(:photo) { Factory(:photo) }
+		# describe 'submitting with valid information' do
+		# 	before do
+		# 		fill_in "product_name", :with => "product name"
+		# 		fill_in "product_price", :with => "855.5"
+		# 		find(:css, "#product_category_ids_[value='1']").set(true)
+		# 		find(:xpath, "//input[@id='description-field']").set "<p>a little longer text</p>"
+		# 		find("#new-Product-button").click
+		# 	end
+		#
+		# 	# it { should have_content(I18n.t("action.save_success"))}
+		# 	# it { expect(Adminpanel::Categorization.count).to eq(1)}
+		# end
+	end
+
+	describe "edit" do
+
+		before do
+			product.category_ids = [category.id]
+			visit adminpanel.edit_product_path(product)
+		end
+
+		it { should have_title(I18n.t("action.update") + " " + Adminpanel::Product.display_name) }
 
+		describe "with invalid information" do
 			before do
-				photo.product_id = product.id
-				visit adminpanel.product_path(product)
+				fill_in "product_name", :with => ""
+				fill_in "product_price", :with => ""
+				find("#new-resource-button").click
 			end
 
-			it { page.should have_selector("div", :text => product.name) }
-			it { page.should have_selector("div", :text => product.price) }
-			it { page.should have_selector("div", :text => product.description) }
-			it { should have_content("#{I18n.t("Gallery")}: #{Adminpanel::Product.display_name}")}
-			it { should have_link("i", adminpanel.edit_product_path(product)) }
+			it 'should stay to products#edit' do
+				current_url.should eq adminpanel.edit_product_url(product)
+			end
+			it { should have_title(I18n.t("action.update") + " " + Adminpanel::Product.display_name) }
+		end
+
+	end
+
+	describe 'show' do
+
+		before do
+			photo.product_id = product.id
+			visit adminpanel.product_path(product)
 		end
+
+		it { page.should have_selector('div', :text => product.name) }
+		it { page.should have_selector('div', :text => product.price) }
+		it { page.should have_selector('div', :text => product.description) }
+		it { should have_content("#{I18n.t("Gallery")}: #{Adminpanel::Product.display_name}")}
+		it { should have_link('i', adminpanel.edit_product_path(product)) }
 	end
 end