rework tests

spec/controllers/errors_controller_spec.rb

@@ -1,5 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe ErrorsController, type: :controller do
-
-end

spec/controllers/sessions_controller_spec.rb

@@ -1,74 +0,0 @@
-require 'rails_helper'
-
-describe SessionsController, type: :controller do
-
-  context "GET #new," do
-    it "renders the #new view." do
-      get :new
-      expect(response).to render_template :new
-    end
-  end
-
-  context "POST #create," do
-    it "should signin user." do
-      user = create(:user)
-      post :create, params: {session: {email: user.email, password: user.password}}
-
-      expect(response).to redirect_to room_path(user.room.uid)
-      expect(user.id).to eql(session[:user_id])
-    end
-
-    it "should render new on fail." do
-      user = create(:user)
-      post :create, params: {session: {email: user.email, password: "incorrect_password"}}
-
-      expect(response).to render_template :new
-    end
-  end
-
-  context "POST #launch," do
-    it "should login launched user." do
-
-    end
-  end
-
-  context "POST #omniauth," do
-    it "should login omniauth user." do
-      email = "omniauth@test.com"
-      uid = "123456789"
-  
-      OmniAuth.config.test_mode = true
-      OmniAuth.config.add_mock(:twitter, {
-        provider: "twitter",
-        uid: uid,
-        info: {
-          email: email,
-          name: "Omni User",
-          nickname: "username"
-        }
-      })
-
-      get "/auth/twitter"
-  
-      request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:twitter]
-      get omniauth_session_path(provider: "twitter")
-  
-      user = User.find_by(email: email, uid: uid)
-  
-      expect(response).to redirect_to room_path(user.room.uid)
-      expect(user.id).to eql(session[:user_id])
-    end
-  end
-
-  context "GET #destroy," do
-    it "should logout user." do
-      user = create(:user)
-      session[:user_id] = user.id
-      get :destroy
-
-      expect(response).to redirect_to root_path
-      expect(user.id).to_not eql(session[:user_id])
-    end
-  end
-
-end

spec/factories.rb

@@ -13,13 +13,7 @@ FactoryBot.define do
   end
 
   factory :room do
-    uid { rand(10 ** 8) }
-    user { create(:user) }
-  end
-
-  factory :meeting do
-    uid { rand(10 ** 8) }
     name { Faker::Pokemon.name }
-    room { create(:room) }
+    owner { create(:user) }
   end
-end
+end

spec/helpers/errors_helper_spec.rb

@@ -1,15 +0,0 @@
-require 'rails_helper'
-
-# Specs in this file have access to a helper object that includes
-# the ErrorsHelper. For example:
-#
-# describe ErrorsHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       expect(helper.concat_strings("this","that")).to eq("this that")
-#     end
-#   end
-# end
-RSpec.describe ErrorsHelper, type: :helper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end

spec/models/meeting_spec.rb

@@ -1,19 +0,0 @@
-require "rails_helper"
-
-describe Meeting, type: :model do
-
-  it "should be valid." do
-    meeting = create(:meeting)
-    expect(meeting).to be_valid
-  end
-
-  it "name should be present." do
-    meeting = build(:meeting, name: nil)
-    expect(meeting).to_not be_valid
-  end
-
-  it "#random_password is random." do
-    meeting = create(:meeting)
-    expect(meeting.send(:random_password, 10)).to_not eql(meeting.send(:random_password, 10))
-  end
-end

spec/models/room_spec.rb

@@ -1,21 +1,27 @@
 require "rails_helper"
 
 describe Room, type: :model do
+  before { @room = create(:room) }
 
-  describe "#owned_by?" do
-    it "should identify correct owner." do
-      room = create(:room)
-      expect(room.owned_by?(room.user)).to eql(true)
-    end
+  context 'validations' do
+    it { should validate_presence_of :name }
+  end
 
-    it "should identify incorrect owner." do
-      room = create(:room)
-      expect(room.owned_by?(create(:user))).to eql(false)
-    end
+  context 'associations' do
+    it { should belong_to(:owner).class_name("User") }
+  end
 
-    it "should return false when user is nil." do
-      room = create(:room)
-      expect(room.owned_by?(nil)).to eql(false)
+  context '#setup' do
+    it 'creates random uid and bbb_id' do
+      expect(@room.uid).to_not be_nil
+      expect(@room.bbb_id).to_not be_nil
     end
   end
-end
+
+  context "#to_param" do
+    it "uses uid as the default identifier for routes" do
+      expect(@room.to_param).to eq(@room.uid)
+    end
+  end
+
+end

spec/models/user_spec.rb

@@ -1,105 +1,59 @@
 require "rails_helper"
 
 describe User, type: :model do
+  before { @user = create(:user) }
 
-  it "should be valid." do
-    user = create(:user)
-    expect(user).to be_valid
-  end
+  context 'validations' do
+    it { should validate_presence_of(:name) }
+    it { should validate_length_of(:name).is_at_most(24) }
 
-  it "name should be present." do
-    user = build(:user, name: nil)
-    expect(user).to_not be_valid
-  end
+    it { should validate_presence_of(:provider) }
 
-  it "username should be present." do
-    user = build(:user, username: nil)
-    expect(user).to_not be_valid
-  end
+    it { should validate_uniqueness_of(:email).case_insensitive }
+    it { should validate_length_of(:email).is_at_most(60) }
+    it { should allow_value("", nil).for(:email) }
+    it { should allow_value("valid@email.com").for(:email) }
+    it { should_not allow_value("invalid_email").for(:email) }
 
-  it "provider should be present." do
-    user = build(:user, provider: nil)
-    expect(user).to_not be_valid
-  end
+    it { should allow_value("valid.jpg").for(:image) }
+    it { should allow_value("valid.png").for(:image) }
+    it { should_not allow_value("invalid.txt").for(:image) }
+    it { should allow_value("", nil).for(:image) }
 
-  it "should allow nil email." do
-    user = build(:user, email: nil)
-    expect(user).to be_valid
-  end
+    context 'is greenlight account' do
+      before { allow(subject).to receive(:greenlight_account?).and_return(true) }
+      it { should validate_presence_of(:password) }
+      it { should validate_length_of(:password).is_at_least(6) }
+    end
 
-  it "should allow nil uid." do
-    user = build(:user, uid: nil)
-    expect(user).to be_valid
-  end
-
-  it "should allow nil password." do
-    user = build(:user, password: nil, password_confirmation: nil)
-    expect(user).to be_valid
-  end
-
-  it "password should be longer than six characters." do
-    user = build(:user, password: "short")
-    expect(user).to_not be_valid
-  end
-
-  it "should create user from omniauth." do
-    auth = {
-      "uid" => "123456789",
-      "provider" => "twitter",
-      "info" => {
-        "name" => "Test Name",
-        "nickname" => "username",
-        "email" => "test@example.com"
-      }
-    }
-
-    user = User.from_omniauth(auth)
-
-    expect(user.name).to eql(auth["info"]["name"])
-    expect(user.username).to eql(auth["info"]["nickname"])
-  end
-
-  it "email addresses should be saved as lower-case." do
-    mixed = "ExAmPlE@eXaMpLe.CoM"
-
-    user = build(:user, email: mixed)
-    user.save
-
-    expect(user.email).to eql(mixed.downcase)
-  end
-
-  it "email validation should reject invalid addresses." do
-    invalid_addresses = %w[user@example,com user_at_foo.org user.name@example. foo@bar_baz.com foo@bar+baz.com]
-    user = create(:user)
-
-    invalid_addresses.each do |invalid_address|
-      user.email = invalid_address
-      expect(user).to_not be_valid
+    context 'is not greenlight account' do
+      before { allow(subject).to receive(:greenlight_account?).and_return(false) }
+      it { should_not validate_presence_of(:password) }
     end
   end
 
-  it "email should be unique." do
-    user = create(:user)
-    duplicate = user.dup
-
-    expect(duplicate).to_not be_valid
+  context 'associations' do
+    it { should belong_to(:main_room).class_name("Room").with_foreign_key("room_id") }
+    it { should have_many(:rooms) }
   end
 
-  it "name should not be too long." do
-    user = build(:user, name: "a" * 25)
-    expect(user).to_not be_valid
+  context '#initialize_main_room' do
+    it 'creates random uid and main_room' do
+      expect(@user.uid).to_not be_nil
+      expect(@user.main_room).to be_a(Room)
+    end
   end
 
-  it "email should not be too long." do
-    user = build(:user, email: "a" * 50 + "@example.com")
-    expect(user).to_not be_valid
+  context "#to_param" do
+    it "uses uid as the default identifier for routes" do
+      expect(@user.to_param).to eq(@user.uid)
+    end
   end
 
-  it "should generate room and meeting when saved." do
-    user = create(:user)
-    user.save
-
-    expect(user.room).to be_instance_of Room
-    expect(user.room.meeting).to be_instance_of Meeting
+  context '#first_name' do
+    it 'properly finds the users first name' do
+      user = create(:user, name: "Example User")
+      expect(user.firstname).to eq("Example")
+    end
   end
-end
+end

spec/rails_helper.rb

@@ -21,7 +21,7 @@ require 'rspec/rails'
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
 # Checks for pending migrations and applies them before tests are run.
 # If you are not using ActiveRecord, you can remove this line.

spec/support/shoulda_matchers.rb

@@ -0,0 +1,9 @@
+# Configure Shoulda-Matchers.
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    
+    with.library :rails
+  end
+end