Merge pull request #3079 from pfarestveit/rspec-upgrade-fixes

CLC-4376: fix Selenium rspec syntax for upgrade

Author: johncrossman

spec/ui_selenium/authentication_deep_linking_spec.rb

@@ -49,7 +49,7 @@
       cal_net_auth_page.logout_conf_heading_element.when_visible(timeout=WebDriverUtils.page_load_timeout)
       @driver.get(semester_page)
       cal_net_auth_page.login(user, password)
-      @driver.current_url.should eql(semester_page)
+      expect(@driver.current_url).to eql(semester_page)
     end
 
     it 'works for My Campus' do

spec/ui_selenium/my_dashboard_google_live_updates_spec.rb

@@ -59,14 +59,14 @@
     context 'for Google mail' do
 
       it 'shows a user an updated count of email messages' do
-        @dashboard.email_count.should eql((@initial_mail_count + 1).to_s)
+        expect(@dashboard.email_count).to eql((@initial_mail_count + 1).to_s)
       end
 
       it 'shows a user a snippet of a new email message' do
         @dashboard.show_unread_email
-        @dashboard.email_one_sender.should eql("me")
-        @dashboard.email_one_subject.should eql('Test email ' + id)
-        @dashboard.email_one_summary.should eql('This is the subject of test email ' + id)
+        expect(@dashboard.email_one_sender).to eql("me")
+        expect(@dashboard.email_one_subject).to eql('Test email ' + id)
+        expect(@dashboard.email_one_summary).to eql('This is the subject of test email ' + id)
       end
     end
 
@@ -75,13 +75,13 @@
       it 'shows a user an updated count of tasks' do
         @to_do_card.click_unscheduled_tasks_tab
         @to_do_card.unsched_task_count_element.when_visible(timeout=WebDriverUtils.page_load_timeout)
-        @to_do_card.unsched_task_count.should eql((@initial_task_count + 1).to_s)
+        expect(@to_do_card.unsched_task_count).to eql((@initial_task_count + 1).to_s)
       end
 
       it 'shows a user the content of a new task' do
         @to_do_card.click_unscheduled_tasks_tab
-        @to_do_card.unsched_task_one_title.should eql('Test task ' + id)
-        @to_do_card.unsched_task_one_date.should eql(Date.today.strftime("%m/%d"))
+        expect(@to_do_card.unsched_task_one_title).to eql('Test task ' + id)
+        expect(@to_do_card.unsched_task_one_date).to eql(Date.today.strftime("%m/%d"))
       end
     end
   end

spec/ui_selenium/my_dashboard_google_tasks_spec.rb

@@ -65,29 +65,29 @@
             if fin_api_page.has_cars_data?
               has_cars_data = true
               it 'does not show a no-data message for UID ' + uid do
-                my_fin_no_cars_msg.should be_falsey
+                expect(my_fin_no_cars_msg).to be false
               end
 
               # API DATA SANITY TESTS
               it 'shows an account balance that is equal to the sum of the open transactions for UID ' + uid do
-                fin_api_page.account_balance_str.should eql(fin_api_page.open_transactions_sum_str)
+                expect(fin_api_page.account_balance_str).to eql(fin_api_page.open_transactions_sum_str)
               end
               it 'shows an account balance that is equal to the sum of the amount due now plus the amount not yet due for UID ' + uid do
-                BigDecimal.new(fin_api_page.account_balance_str).should eql(BigDecimal.new(fin_api_page.min_amt_due_str) +
+                expect(BigDecimal.new(fin_api_page.account_balance_str)).to eql(BigDecimal.new(fin_api_page.min_amt_due_str) +
                                                                                 BigDecimal.new(fin_api_page.future_activity_str))
               end
               if fin_api_page.account_balance >= 0
                 it 'shows an account balance that is greater than or equal to the minimum amount due now for UID ' + uid do
-                  fin_api_page.account_balance.should be >= fin_api_page.min_amt_due
+                  expect(fin_api_page.account_balance).to be >= fin_api_page.min_amt_due
                 end
                 it 'shows an account balance that is greater than or equal to the past due amount for UID ' + uid do
-                  fin_api_page.account_balance.should be >= fin_api_page.past_due_amt
+                  expect(fin_api_page.account_balance).to be >= fin_api_page.past_due_amt
                 end
                 it 'shows an account balance that is greater than or equal to the amount not yet due for UID ' + uid do
-                  fin_api_page.account_balance.should be >= fin_api_page.future_activity
+                  expect(fin_api_page.account_balance).to be >= fin_api_page.future_activity
                 end
                 it 'shows an account balance that is greater than or equal to the DPP balance for UID ' + uid do
-                  fin_api_page.account_balance.should be >= fin_api_page.dpp_balance
+                  expect(fin_api_page.account_balance).to be >= fin_api_page.dpp_balance
                 end
               end
 
@@ -99,52 +99,52 @@
                 acct_bal = 'Positive'
                 my_fin_balance_transactions = my_finances_page.visible_transactions_sum_str
                 it 'shows the open charges for UID ' + uid do
-                  my_fin_balance_transactions.should eql(fin_api_page.open_charges_sum_str)
+                  expect(my_fin_balance_transactions).to eql(fin_api_page.open_charges_sum_str)
                 end
               elsif fin_api_page.account_balance == 0
                 acct_bal = 'Zero'
                 it 'shows a zero balance message for UID ' + uid do
-                  my_fin_zero_bal_text.should be_true
+                  expect(my_fin_zero_bal_text).to be true
                 end
               elsif fin_api_page.account_balance < 0
                 acct_bal = 'Negative'
                 it 'shows a credit balance message for UID ' + uid do
-                  my_fin_credit_bal_text.should be_true
+                  expect(my_fin_credit_bal_text).to be true
                 end
               end
               it 'shows the right account balance for UID ' + uid do
-                my_fin_acct_bal.should eql(fin_api_page.account_balance_str)
+                expect(my_fin_acct_bal).to eql(fin_api_page.account_balance_str)
               end
 
               # AMOUNT DUE NOW
               my_fin_amt_due_label = my_finances_page.amt_due_now_label
               if fin_api_page.min_amt_due > 0
                 amt_due_now = 'Positive'
                 it 'shows the label Amount Due Now for UID ' + uid do
-                  my_fin_amt_due_label.should include('Amount Due Now')
+                  expect(my_fin_amt_due_label).to include('Amount Due Now')
                 end
               elsif fin_api_page.min_amt_due == 0
                 amt_due_now = 'Zero'
                 it 'shows the label Amount Due Now for UID ' + uid do
-                  my_fin_amt_due_label.should include('Amount Due Now')
+                  expect(my_fin_amt_due_label).to include('Amount Due Now')
                 end
               elsif fin_api_page.min_amt_due < 0
                 amt_due_now = 'Negative'
                 it 'shows the label Credit Balance for UID ' + uid do
-                  my_fin_amt_due_label.should include('Credit Balance')
+                  expect(my_fin_amt_due_label).to include('Credit Balance')
                 end
               end
               my_fin_amt_due_now = my_finances_page.amt_due_now
               it 'shows the right amount due now for UID ' + uid do
-                my_fin_amt_due_now.should eql(fin_api_page.min_amt_due_str)
+                expect(my_fin_amt_due_now).to eql(fin_api_page.min_amt_due_str)
               end
 
               # PAST DUE AMOUNT
               if fin_api_page.past_due_amt > 0
                 has_past_due_amt = true
                 my_fin_past_due_bal = my_finances_page.past_due_amt
                 it 'shows the past due amount for UID ' + uid do
-                  my_fin_past_due_bal.should eql(fin_api_page.past_due_amt_str)
+                  expect(my_fin_past_due_bal).to eql(fin_api_page.past_due_amt_str)
                 end
               end
 
@@ -153,23 +153,23 @@
                 has_future_activity = true
                 my_fin_future_activity = my_finances_page.charges_not_due
                 it 'shows the charges not yet due for UID ' + uid do
-                  my_fin_future_activity.should eql(fin_api_page.future_activity_str)
+                  expect(my_fin_future_activity).to eql(fin_api_page.future_activity_str)
                 end
               end
 
               # MAKE PAYMENT LINK
               my_fin_pmt_link = my_finances_page.make_payment_link?
               if fin_api_page.account_balance != 0
                 it 'shows make payment link for UID ' + uid do
-                  my_fin_pmt_link.should be_truthy
+                  expect(my_fin_pmt_link).to be true
                 end
               end
 
               # LAST STATEMENT BALANCE
               my_finances_page.show_last_statement_bal
               my_fin_last_bal = my_finances_page.last_statement_balance
               it 'shows the right last statement balance for UID ' + uid do
-                my_fin_last_bal.should eql(fin_api_page.last_statement_balance_str)
+                expect(my_fin_last_bal).to eql(fin_api_page.last_statement_balance_str)
               end
 
               # DPP
@@ -180,36 +180,36 @@
                 is_dpp = true
                 my_fin_dpp_bal = my_finances_page.dpp_balance
                 it 'shows DPP balance for UID ' + uid do
-                  my_fin_dpp_bal.should eql(fin_api_page.dpp_balance_str)
+                  expect(my_fin_dpp_bal).to eql(fin_api_page.dpp_balance_str)
                 end
                 it 'shows DPP informational text for UID ' + uid do
-                  my_fin_dpp_text.should be_truthy
+                  expect(my_fin_dpp_text).to be true
                 end
                 if fin_api_page.dpp_balance > 0
                   has_dpp_balance = true
                   my_fin_dpp_install = my_finances_page.dpp_normal_install
                   it 'shows DPP normal installment amount for UID ' + uid do
-                    my_fin_dpp_install.should eql(fin_api_page.dpp_norm_install_amt_str)
+                    expect(my_fin_dpp_install).to eql(fin_api_page.dpp_norm_install_amt_str)
                   end
                 else
                   it 'shows no DPP normal installment amount for UID ' + uid do
-                    my_fin_dpp_install_element.should be_falsey
+                    expect(my_fin_dpp_install_element).to be false
                   end
                 end
                 if fin_api_page.is_dpp_past_due?
                   is_dpp_past_due = true
                 end
               else
                 it 'shows no DPP balance for UID ' + uid do
-                  my_fin_dpp_bal_element.should be_falsey
+                  expect(my_fin_dpp_bal_element).to be false
                 end
                 it 'shows no DPP informational text for UID ' + uid do
-                  my_fin_dpp_text.should be_falsey
+                  expect(my_fin_dpp_text).to be false
                 end
               end
             else
               it 'shows a no-data message for UID ' + uid do
-                my_fin_no_cars_msg.should be_truthy
+                expect(my_fin_no_cars_msg).to be true
               end
             end