Fixed some unit tests

Still need to complete the refactoring of ReadingGroupOwnership and KalibroConfigurationOwnership Signed off by: Pedro Scocco <pedroscocco@gmail.com>

Fixed some unit tests
Still need to complete the refactoring of ReadingGroupOwnership and KalibroConfigurationOwnership Signed off by: Pedro Scocco <pedroscocco@gmail.com>
Diego Camarinha
1 parent 6810ee7c
Showing 10 changed files with 35 additions and 31 deletions Show diff stats
app/controllers/kalibro_configurations_controller.rb
app/controllers/reading_groups_controller.rb
db/schema.rb
spec/controllers/compound_metric_configurations_controller_spec.rb
spec/controllers/kalibro_configurations_controller_spec.rb
spec/controllers/kalibro_ranges_controller_spec.rb
spec/controllers/reading_groups_controller_spec.rb
spec/factories/kalibro_configurations.rb
spec/factories/reading_groups.rb
spec/helpers/kalibro_configurations_helper_spec.rb
@@ -12,7 +12,7 @@ class KalibroConfigurationsController &lt; ApplicationController
   # GET /kalibro_configurations
   # GET /kalibro_configurations.json
   def index
-    @kalibro_configurations = KalibroConfigurationAttributes.where(hidden: false).map { |cfg_attr|
+    @kalibro_configurations = KalibroConfigurationAttributes.where(public: true).map { |cfg_attr|
       KalibroConfiguration.find(cfg_attr.kalibro_configuration_id)
     }.compact
   end
@@ -13,7 +13,7 @@ class ReadingGroupsController &lt; ApplicationController
   # GET /reading_groups
   # GET /reading_groups.json
   def index
-    @reading_groups = ReadingGroup.visible
+    @reading_groups = ReadingGroup.public
   end
   # POST /reading_groups
@@ -39,19 +39,19 @@ ActiveRecord::Schema.define(version: 20150511181035) do
   end
   create_table "users", force: :cascade do |t|
-    t.string   "name",                   default: "", null: false
-    t.string   "email",                  default: "", null: false
+    t.string   "name",                   limit: 255, default: "", null: false
+    t.string   "email",                  limit: 255, default: "", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+    t.string   "encrypted_password",     limit: 255, default: "", null: false
+    t.string   "reset_password_token",   limit: 255
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0
+    t.integer  "sign_in_count",                      default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
+    t.string   "current_sign_in_ip",     limit: 255
+    t.string   "last_sign_in_ip",        limit: 255
   end
   add_index "users", ["email"], name: "index_users_on_email", unique: true
@@ -99,7 +99,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
           get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s
         end
-        xit { is_expected.to render_template(:edit) }
+        it { is_expected.to render_template(:edit) }
       end
       context 'when the user does not own the compound metric configuration' do
@@ -107,7 +107,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
           get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s
         end
-        xit { is_expected.to redirect_to(kalibro_configurations_path(id: kalibro_configuration.id)) }
+        it { is_expected.to redirect_to(kalibro_configurations_path(id: kalibro_configuration.id)) }
         it { is_expected.to respond_with(:redirect) }
         it { is_expected.to set_flash[:notice].to("You're not allowed to do this operation") }
       end
@@ -157,7 +157,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
             post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params
           end
-          xit { should render_template(:edit) }
+          it { should render_template(:edit) }
         end
       end
@@ -132,13 +132,15 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
   end
   describe 'index' do
+    let!(:kalibro_configuration_attribute) { FactoryGirl.build(:kalibro_configuration_attributes) }
     before :each do
       @subject = FactoryGirl.build(:kalibro_configuration, :with_id)
-      KalibroConfiguration.expects(:all).returns([@subject])
+      KalibroConfigurationAttributes.expects(:where).with(public: true).returns([kalibro_configuration_attribute])
+      KalibroConfiguration.expects(:find).with(kalibro_configuration_attribute.kalibro_configuration_id).returns(@subject)
       get :index
     end
-    xit { is_expected.to render_template(:index) }
+    it { is_expected.to render_template(:index) }
   end
   describe 'edit' do
@@ -54,8 +54,8 @@ describe KalibroRangesController, :type =&gt; :controller do
           post :create, kalibro_configuration_id: kalibro_configuration.id, metric_configuration_id: kalibro_range.metric_configuration_id, kalibro_range: kalibro_range_params
         end
-        xit { is_expected.to redirect_to(kalibro_configuration_metric_configuration_path(kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id)) }
-        xit { is_expected.to respond_with(:redirect) }
+        it { is_expected.to redirect_to(kalibro_configuration_metric_configuration_path(kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id)) }
+        it { is_expected.to respond_with(:redirect) }
       end
       context 'with valid fields and a compound metric configuration' do
@@ -69,8 +69,8 @@ describe KalibroRangesController, :type =&gt; :controller do
           post :create, kalibro_configuration_id: kalibro_configuration.id, metric_configuration_id: new_kalibro_range.metric_configuration_id, kalibro_range: new_kalibro_range.to_hash
         end
-        xit { is_expected.to redirect_to(kalibro_configuration_compound_metric_configuration_path(kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id)) }
-        xit { is_expected.to respond_with(:redirect) }
+        it { is_expected.to redirect_to(kalibro_configuration_compound_metric_configuration_path(kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id)) }
+        it { is_expected.to respond_with(:redirect) }
       end
       context 'with invalid fields' do
@@ -126,13 +126,15 @@ describe ReadingGroupsController, :type =&gt; :controller do
   end
   describe 'index' do
+    let!(:reading_group_attribute) { FactoryGirl.build(:reading_group_attributes) }
     before :each do
       @subject = FactoryGirl.build(:reading_group, :with_id)
-      ReadingGroup.expects(:all).returns([@subject])
+      ReadingGroupAttributes.expects(:where).with(public: true).returns([reading_group_attribute])
+      ReadingGroup.expects(:find).with(reading_group_attribute.reading_group_id).returns([@subject])
       get :index
     end
-    xit { is_expected.to render_template(:index) }
+    it { is_expected.to render_template(:index) }
   end
   describe 'edit' do
@@ -4,7 +4,7 @@ FactoryGirl.define do
     description "Code metrics for Java."
     trait :with_id do
-      sequence(:id, 1)
+      id 1
     end
     factory :another_kalibro_configuration do
@@ -12,4 +12,4 @@ FactoryGirl.define do
       description "The best one"
     end
   end
-end
 \ No newline at end of file
+end
@@ -18,13 +18,13 @@ describe KalibroConfigurationsHelper, :type =&gt; :helper do
         helper.expects(:user_signed_in?).returns(true)
         helper.expects(:current_user).returns(FactoryGirl.build(:user))
-        @ownerships = []
-        @ownerships.expects(:find_by_kalibro_configuration_id).with(@subject.id).returns(nil)
+        @attributes = []
+        @attributes.expects(:find_by_kalibro_configuration_id).with(@subject.id).returns(nil)
-        User.any_instance.expects(:kalibro_configuration_ownerships).returns(@ownerships)
+        User.any_instance.expects(:kalibro_configuration_attributes).returns(@attributes)
       end
-      xit { expect(helper.kalibro_configuration_owner?(@subject.id)).to be_falsey }
+      it { expect(helper.kalibro_configuration_owner?(@subject.id)).to be_falsey }
     end
     context 'returns true if user is the kalibro_configuration owner' do
@@ -32,13 +32,13 @@ describe KalibroConfigurationsHelper, :type =&gt; :helper do
         helper.expects(:user_signed_in?).returns(true)
         helper.expects(:current_user).returns(FactoryGirl.build(:user))
-        @ownership = FactoryGirl.build(:kalibro_configuration_ownership)
-        @ownerships = []
-        @ownerships.expects(:find_by_kalibro_configuration_id).with(@subject.id).returns(@ownership)
-        User.any_instance.expects(:kalibro_configuration_ownerships).returns(@ownerships)
+        @ownership = FactoryGirl.build(:kalibro_configuration_attributes)
+        @attributes = []
+        @attributes.expects(:find_by_kalibro_configuration_id).with(@subject.id).returns(@ownership)
+        User.any_instance.expects(:kalibro_configuration_attributes).returns(@attributes)
       end
-      xit { expect(helper.kalibro_configuration_owner?(@subject.id)).to be_truthy }
+      it { expect(helper.kalibro_configuration_owner?(@subject.id)).to be_truthy }
     end
   end
	@@ -12,7 +12,7 @@ class KalibroConfigurationsController < ApplicationController		@@ -12,7 +12,7 @@ class KalibroConfigurationsController < ApplicationController
12	# GET /kalibro_configurations	12	# GET /kalibro_configurations
13	# GET /kalibro_configurations.json	13	# GET /kalibro_configurations.json
14	def index	14	def index
15	- @kalibro_configurations = KalibroConfigurationAttributes.where(hidden: false).map { \|cfg_attr\|	15	+ @kalibro_configurations = KalibroConfigurationAttributes.where(public: true).map { \|cfg_attr\|
16	KalibroConfiguration.find(cfg_attr.kalibro_configuration_id)	16	KalibroConfiguration.find(cfg_attr.kalibro_configuration_id)
17	}.compact	17	}.compact
18	end	18	end
	@@ -13,7 +13,7 @@ class ReadingGroupsController < ApplicationController		@@ -13,7 +13,7 @@ class ReadingGroupsController < ApplicationController
13	# GET /reading_groups	13	# GET /reading_groups
14	# GET /reading_groups.json	14	# GET /reading_groups.json
15	def index	15	def index
16	- @reading_groups = ReadingGroup.visible	16	+ @reading_groups = ReadingGroup.public
17	end	17	end
18		18
19	# POST /reading_groups	19	# POST /reading_groups
	@@ -99,7 +99,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do		@@ -99,7 +99,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do
99	get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s	99	get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s
100	end	100	end
101		101
102	- xit { is_expected.to render_template(:edit) }	102	+ it { is_expected.to render_template(:edit) }
103	end	103	end
104		104
105	context 'when the user does not own the compound metric configuration' do	105	context 'when the user does not own the compound metric configuration' do
	@@ -107,7 +107,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do		@@ -107,7 +107,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do
107	get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s	107	get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s
108	end	108	end
109		109
110	- xit { is_expected.to redirect_to(kalibro_configurations_path(id: kalibro_configuration.id)) }	110	+ it { is_expected.to redirect_to(kalibro_configurations_path(id: kalibro_configuration.id)) }
111	it { is_expected.to respond_with(:redirect) }	111	it { is_expected.to respond_with(:redirect) }
112	it { is_expected.to set_flash[:notice].to("You're not allowed to do this operation") }	112	it { is_expected.to set_flash[:notice].to("You're not allowed to do this operation") }
113	end	113	end
	@@ -157,7 +157,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do		@@ -157,7 +157,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do
157	post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params	157	post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params
158	end	158	end
159		159
160	- xit { should render_template(:edit) }	160	+ it { should render_template(:edit) }
161	end	161	end
162	end	162	end
163		163
	@@ -4,7 +4,7 @@ FactoryGirl.define do		@@ -4,7 +4,7 @@ FactoryGirl.define do
4	description "Code metrics for Java."	4	description "Code metrics for Java."
5		5
6	trait :with_id do	6	trait :with_id do
7	- sequence(:id, 1)	7	+ id 1
8	end	8	end
9		9
10	factory :another_kalibro_configuration do	10	factory :another_kalibro_configuration do
	@@ -12,4 +12,4 @@ FactoryGirl.define do		@@ -12,4 +12,4 @@ FactoryGirl.define do
12	description "The best one"	12	description "The best one"
13	end	13	end
14	end	14	end
15	-end
16	\ No newline at end of file	15	\ No newline at end of file
		16	+end