diff --git a/app/controllers/kalibro_configurations_controller.rb b/app/controllers/kalibro_configurations_controller.rb index e411436..8a7b8f7 100644 --- a/app/controllers/kalibro_configurations_controller.rb +++ b/app/controllers/kalibro_configurations_controller.rb @@ -12,7 +12,7 @@ class KalibroConfigurationsController < 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 diff --git a/app/controllers/reading_groups_controller.rb b/app/controllers/reading_groups_controller.rb index 374e1f4..1dbb755 100644 --- a/app/controllers/reading_groups_controller.rb +++ b/app/controllers/reading_groups_controller.rb @@ -13,7 +13,7 @@ class ReadingGroupsController < ApplicationController # GET /reading_groups # GET /reading_groups.json def index - @reading_groups = ReadingGroup.visible + @reading_groups = ReadingGroup.public end # POST /reading_groups diff --git a/db/schema.rb b/db/schema.rb index 29f24de..ac1b943 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -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 diff --git a/spec/controllers/compound_metric_configurations_controller_spec.rb b/spec/controllers/compound_metric_configurations_controller_spec.rb index 863e575..47b1c55 100644 --- a/spec/controllers/compound_metric_configurations_controller_spec.rb +++ b/spec/controllers/compound_metric_configurations_controller_spec.rb @@ -99,7 +99,7 @@ describe CompoundMetricConfigurationsController, :type => :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 => :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 => :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 diff --git a/spec/controllers/kalibro_configurations_controller_spec.rb b/spec/controllers/kalibro_configurations_controller_spec.rb index 2abd5fe..dc446ba 100644 --- a/spec/controllers/kalibro_configurations_controller_spec.rb +++ b/spec/controllers/kalibro_configurations_controller_spec.rb @@ -132,13 +132,15 @@ describe KalibroConfigurationsController, :type => :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 diff --git a/spec/controllers/kalibro_ranges_controller_spec.rb b/spec/controllers/kalibro_ranges_controller_spec.rb index 0cc5c78..8927073 100644 --- a/spec/controllers/kalibro_ranges_controller_spec.rb +++ b/spec/controllers/kalibro_ranges_controller_spec.rb @@ -54,8 +54,8 @@ describe KalibroRangesController, :type => :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 => :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 diff --git a/spec/controllers/reading_groups_controller_spec.rb b/spec/controllers/reading_groups_controller_spec.rb index 4cc2caa..9f8b70d 100644 --- a/spec/controllers/reading_groups_controller_spec.rb +++ b/spec/controllers/reading_groups_controller_spec.rb @@ -126,13 +126,15 @@ describe ReadingGroupsController, :type => :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 diff --git a/spec/factories/kalibro_configurations.rb b/spec/factories/kalibro_configurations.rb index bfed6aa..36dd071 100644 --- a/spec/factories/kalibro_configurations.rb +++ b/spec/factories/kalibro_configurations.rb @@ -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 diff --git a/spec/factories/reading_groups.rb b/spec/factories/reading_groups.rb index 59dd90e..a00ace8 100644 --- a/spec/factories/reading_groups.rb +++ b/spec/factories/reading_groups.rb @@ -12,4 +12,4 @@ FactoryGirl.define do description "The best one" end end -end \ No newline at end of file +end diff --git a/spec/helpers/kalibro_configurations_helper_spec.rb b/spec/helpers/kalibro_configurations_helper_spec.rb index d7a0d9f..684fd30 100644 --- a/spec/helpers/kalibro_configurations_helper_spec.rb +++ b/spec/helpers/kalibro_configurations_helper_spec.rb @@ -18,13 +18,13 @@ describe KalibroConfigurationsHelper, :type => :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 => :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 -- libgit2 0.21.2