Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/expertiza/expertiza
Browse files Browse the repository at this point in the history
  • Loading branch information
Saurabh110 committed Feb 22, 2020
2 parents 6ca144b + 22fc522 commit 1999414
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/controllers/late_policies_controller.rb
Expand Up @@ -73,8 +73,8 @@ def create
@late_policy.save!
flash[:notice] = "The penalty policy was successfully created."
redirect_to action: 'index'
rescue StandardError
flash[:error] = "The following error occurred while saving the penalty policy: "
rescue StandardError => e
flash[:error] = "The following error occurred while saving the penalty policy: " + e.message
redirect_to action: 'new'
end
else
Expand Down
2 changes: 1 addition & 1 deletion spec/features/assignment_creation_spec.rb
Expand Up @@ -227,7 +227,7 @@ def fill_assignment_form
fill_in 'assignment_form_assignment_directory_path', with: 'testDirectory'

find_link('ReviewStrategy').click
expect(page).to have_content("Review Strategy")
expect(page).to have_content("Review strategy")
end

it "is able show tab due deadlines" do
Expand Down

0 comments on commit 1999414

Please sign in to comment.