Factory girl

Gemfile

@@ -39,4 +39,5 @@ group :development, :test do
   gem 'capybara'
   gem 'launchy'
   gem 'rspec-rails'
+  gem 'factory_girl_rails'
 end

Gemfile.lock

@@ -48,6 +48,11 @@ GEM
     diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.7.0)
+    factory_girl (4.8.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)
+      railties (>= 3.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     font-awesome-rails (4.6.3.1)
@@ -171,6 +176,7 @@ DEPENDENCIES
   byebug
   capybara
   coffee-rails (~> 4.0.0)
+  factory_girl_rails
   font-awesome-rails
   foundation-rails
   jquery-rails
@@ -189,4 +195,4 @@ RUBY VERSION
    ruby 2.2.2p95
 
 BUNDLED WITH
-   1.14.3
+   1.14.5

spec/factories/users.rb

@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :user do
+    provider "google_oauth2"
+    sequence :uid do |n|
+      n
+    end
+    sequence :name do |n|
+       "Fake User#{n}"
+    end
+    approval_at "2017-02-25 23:28:13"
+  end
+end

spec/features/users_spec.rb

@@ -1,90 +1,72 @@
-feature "User management" do
+feature "user management" do
   let(:users_index_path) { polymorphic_path([:users]) }
 
-  context "when an admin user visits the users index" do
-    let!(:admin_user) { login_new_admin_user }
-    subject { admin_user }
+  context "when an admin visits the users index" do
+    let!(:admin) { login_new_admin_user }
+    let!(:users) { create_list(:user, 2) }
+    let!(:unapproved_user) { create(:user, approval_at: nil)}
 
     before { visit users_index_path }
 
     it "displays a table of users" do
       expect(page).to have_table("users_table")
     end
 
-    it "fills the table with the right headers and rows" do
-      check_headers_and_values_on_generic_index_page(
-        "users_table", {
-          "Name" => "Example User",
-          "Created At" => subject.created_at_string,
-          "Approval At" => subject.approval_at_string,
-          "Admin" => "true",
-          "Actions" => "Remove Approval Delete",
-        }
-      )
+    it "sees a table with proper headers and rows" do
+      expect(page).to have_css("#user_#{admin.id}", :text => "#{admin.name}")
+      expect(page).to have_css("#user_#{admin.id}", :text => "#{admin.created_at_string}")
+      expect(page).to have_css("#user_#{admin.id}", :text => "#{admin.approval_at_string}")
+      expect(page).to have_css("#user_#{admin.id}", :text => "Delete")
+      expect(page).to have_css("#user_#{admin.id}", :text => "Yes")
+      expect(page).to_not have_css("#user_#{admin.id}", :text => "No")
     end
 
-    context "and a new non-admin user is added" do
-      subject! { User.create!(name: "Joe") }
-
-      before { visit users_index_path }
+    it "sees a table with proper headers and rows" do
+      expect(page).to have_css("#user_#{users.first.id}", :text => "#{users.first.name}")
+      expect(page).to have_css("#user_#{users.first.id}", :text => "#{users.first.created_at_string}")
+      expect(page).to have_css("#user_#{users.first.id}", :text => "#{users.first.approval_at_string}")
+      expect(page).to have_link('Yes', :href => remove_approval_user_path(users.first.id))
+      expect(page).to_not have_link('No', :href => approve_user_path(users.first.id))
+      expect(page).to have_link('No', :href => toggle_admin_user_path(users.first.id))
+      expect(page).to_not have_link('Yes', :href => toggle_admin_user_path(users.first.id))
+    end
 
-      it "fills the table with that user\"s information too" do
-        check_headers_and_values_on_generic_index_page(
-          "users_table", {
-            "Name" => "Joe",
-            "Created At" => subject.created_at_string,
-            "Approval At" => "",
-            "Admin" => "",
-            "Actions" => "Approve Delete",
-          }
-        )
+    context "the admin clicks Yes for user approval" do
+      before do
+        find(:xpath, "//a[@href='/users/#{unapproved_user.id}/approve']").click
       end
 
-      context "and the current user clicks the approve link for that user" do
-        before do
-          within(:row_for, subject) do
-            click_link "Approve"
-          end
-        end
+      it "approves the user" do
+        expect(unapproved_user.reload).to be_approved
+      end
 
-        it "approves the user" do
-          expect(subject.reload).to be_approved
-        end
+      it "displays an approval time" do
+        expect(page).to have_content(unapproved_user.approval_at_string)
+      end
 
-        it "displays an approval time" do
-          within(:row_for, subject) do
-            expect(find(:value_under_header, "Approval At").text).to_not be_blank
-          end
-        end
+      it "no longer shows the approve link" do
+        expect(page).to have_link('Yes', :href => remove_approval_user_path(unapproved_user))
+      end
 
-        it "no longer shows the approve link" do
-          within(:row_for, subject) do
-            expect(find(:value_under_header, "Actions").text).to eq "Remove Approval Delete"
-          end
+      context "and the admin clicks No for user approval for same user" do
+        before do
+          find(:xpath, "//a[@href='/users/#{unapproved_user.id}/remove_approval']").click
         end
 
-        context "and the current user clicks the Remove Approval link for that user" do
-          before do
-            within(:row_for, subject) do
-              click_link "Remove Approval"
-            end
-          end
-
-          it "removes the user's approval" do
-            expect(subject.reload).to_not be_approved
-          end
+        it "removes the user's approval" do
+          expect(unapproved_user.reload).to_not be_approved
         end
       end
 
-      context "and the current user clicks the delete link for that user" do
+      context "and the admin clicks the delete link for same user" do
         before do
-          within(:row_for, subject) do
+          within(:css, "#user_#{unapproved_user.id}") do
             click_link "Delete"
           end
         end
 
         it "deletes the user" do
-          expect(User.find_by_id(subject.id)).to be_nil
+          expect(User.find_by_id(unapproved_user.id)).to be_nil
         end
       end
     end

spec/support/factories.rb

@@ -0,0 +1,3 @@
+FactoryGirl.define do
+  # <factories for each model go here>
+end

spec/support/factory_girl.rb

@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end

spec/support/feature_helpers.rb

@@ -1,7 +1,9 @@
 module FeatureHelpers
   def login_new_user(options = {})
     visit "/"
-    click_link "Sign in"
+    within(:css, ".super-button") do
+     click_link "Sign in or sign up"
+    end
     user = User.last
     user.admin = options[:admin] || false
     user.approval_at = options[:approval_at] || Time.now