mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-14 19:04:51 +08:00
- Removing some long ignored test cases.
--HG-- branch : dev
This commit is contained in:
@@ -72,20 +72,6 @@ namespace Orchard.Core.Tests.Common.Providers {
|
||||
Assert.That(item.Record.OwnerId, Is.EqualTo(0));
|
||||
}
|
||||
|
||||
[Test,Ignore("This testing is still being worked out")]
|
||||
public void OwnerShouldBeAuthenticatedUserIfAvailable() {
|
||||
var contentManager = _container.Resolve<IContentManager>();
|
||||
|
||||
var user = contentManager.New<IUser>("user");
|
||||
_authn.Setup(x => x.GetAuthenticatedUser()).Returns(user);
|
||||
|
||||
var item = contentManager.Create<CommonAspect>("test-item", init => { });
|
||||
|
||||
ClearSession();
|
||||
|
||||
Assert.That(item.Record.OwnerId, Is.EqualTo(6655321));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void PublishingShouldSetPublishUtc() {
|
||||
var contentManager = _container.Resolve<IContentManager>();
|
||||
|
@@ -87,7 +87,6 @@
|
||||
<Compile Include="Roles\Controllers\AdminControllerTests.cs" />
|
||||
<Compile Include="Roles\Services\RoleServiceTests.cs" />
|
||||
<Compile Include="Settings\Topology\ShellDescriptorManagerTests.cs" />
|
||||
<Compile Include="Setup\SetupControllerTests.cs" />
|
||||
<Compile Include="Values.cs" />
|
||||
<Compile Include="Users\Controllers\AdminControllerTests.cs" />
|
||||
<Compile Include="Users\Services\MembershipServiceTests.cs" />
|
||||
|
@@ -34,19 +34,5 @@ namespace Orchard.Tests.Modules.Roles.Services {
|
||||
Assert.That(roles, Has.Some.Property("Name").EqualTo("two"));
|
||||
Assert.That(roles, Has.Some.Property("Name").EqualTo("three"));
|
||||
}
|
||||
|
||||
[Test, Ignore("Permissions should be created first it appears?")]
|
||||
public void PermissionRecordsShouldBeCreatedOnDemand() {
|
||||
var service = _container.Resolve<IRoleService>();
|
||||
service.CreateRole("one");
|
||||
service.CreatePermissionForRole("one", "foo");
|
||||
service.CreatePermissionForRole("one", "bar");
|
||||
ClearSession();
|
||||
|
||||
var one = service.GetRoles().Single(x => x.Name == "one");
|
||||
Assert.That(one.RolesPermissions, Has.Count.EqualTo(2));
|
||||
Assert.That(one.RolesPermissions.Select(x => x.Permission.Name), Has.Some.EqualTo("foo"));
|
||||
Assert.That(one.RolesPermissions.Select(x => x.Permission.Name), Has.Some.EqualTo("bar"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -1,106 +0,0 @@
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Web.Mvc;
|
||||
using System.Web.Routing;
|
||||
using Autofac;
|
||||
using NUnit.Framework;
|
||||
using Orchard.Environment;
|
||||
using Orchard.Environment.AutofacUtil;
|
||||
using Orchard.Environment.Configuration;
|
||||
using Orchard.Setup.Controllers;
|
||||
using Orchard.Setup.ViewModels;
|
||||
using Orchard.UI.Notify;
|
||||
|
||||
namespace Orchard.Tests.Modules.Setup {
|
||||
[TestFixture, Ignore("this can't be made to work")]
|
||||
public class SetupControllerTests {
|
||||
private string _tempFolder;
|
||||
private ILifetimeScope _container;
|
||||
|
||||
[SetUp]
|
||||
public void Init() {
|
||||
//_tempFolder = Path.GetTempFileName();
|
||||
//File.Delete(_tempFolder);
|
||||
//Directory.CreateDirectory(_tempFolder);
|
||||
|
||||
//var hostContainer = OrchardStarter.CreateHostContainer(builder => {
|
||||
// builder.RegisterInstance(new ControllerBuilder());
|
||||
// builder.RegisterInstance(new ViewEngineCollection { new WebFormViewEngine() });
|
||||
// builder.RegisterInstance(new RouteCollection());
|
||||
// builder.RegisterInstance(new ModelBinderDictionary());
|
||||
//});
|
||||
|
||||
//hostContainer.Resolve<IAppDataFolder>().SetBasePath(_tempFolder);
|
||||
|
||||
//var host = (DefaultOrchardHost)hostContainer.Resolve<IOrchardHost>();
|
||||
//_container = host.CreateShellContainer_Obsolete().BeginLifetimeScope();
|
||||
//var updater = new ContainerUpdater();
|
||||
//updater.RegisterType<SetupController>();
|
||||
//updater.Update(_container);
|
||||
|
||||
//var builder = new ContainerBuilder();
|
||||
//builder.Register<SetupController>();
|
||||
//builder.Register<Notifier>().As<INotifier>();
|
||||
//builder.Register<DefaultOrchardHost>().As<IOrchardHost>();
|
||||
//builder.Register<DatabaseMigrationManager>().As<IDatabaseMigrationManager>();
|
||||
//builder.Register<ShellSettingsManager>().As<IShellSettingsManager>();
|
||||
//builder.Register<TestAppDataFolder>().As<IAppDataFolder>();
|
||||
//_container = builder.Build();
|
||||
}
|
||||
|
||||
private string GetMessages() {
|
||||
var notifier = _container.Resolve<INotifier>();
|
||||
return notifier.List().Aggregate("", (a, b) => a + b.Message.ToString());
|
||||
}
|
||||
|
||||
private SetupViewModel GetTestSetupModel() {
|
||||
return new SetupViewModel {
|
||||
AdminUsername = "test1",
|
||||
AdminPassword = "test2",
|
||||
DatabaseOptions = true,
|
||||
SiteName = "test3"
|
||||
};
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void IndexNormallyReturnsWithDefaultAdminUsername() {
|
||||
var controller = _container.Resolve<SetupController>();
|
||||
var result = controller.Index();
|
||||
|
||||
Assert.That(result, Is.Not.Null);
|
||||
Assert.That(result, Is.TypeOf<ViewResult>());
|
||||
|
||||
var viewResult = (ViewResult)result;
|
||||
Assert.That(viewResult.ViewData.Model, Is.TypeOf<SetupViewModel>());
|
||||
|
||||
var model2 = (SetupViewModel)viewResult.ViewData.Model;
|
||||
Assert.That(model2.AdminUsername, Is.EqualTo("admin"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SetupShouldCreateShellSettingsFile() {
|
||||
var model = GetTestSetupModel();
|
||||
var controller = _container.Resolve<SetupController>();
|
||||
var result = controller.IndexPOST(model);
|
||||
|
||||
Assert.That(GetMessages(), Is.StringContaining("Setup succeeded"));
|
||||
Assert.That(result, Is.Not.Null);
|
||||
Assert.That(result, Is.TypeOf<RedirectResult>());
|
||||
Assert.That(File.Exists(Path.Combine(_tempFolder, "Sites\\default.txt")));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BuiltinDatabaseShouldCreateSQLiteFile() {
|
||||
var model = GetTestSetupModel();
|
||||
var controller = _container.Resolve<SetupController>();
|
||||
var result = controller.IndexPOST(model);
|
||||
|
||||
Assert.That(GetMessages(), Is.StringContaining("Setup succeeded"));
|
||||
Assert.That(result, Is.Not.Null);
|
||||
Assert.That(result, Is.TypeOf<RedirectResult>());
|
||||
Assert.That(File.Exists(Path.Combine(_tempFolder, "Sites\\default\\orchard.db")));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
@@ -11,19 +11,6 @@ namespace Orchard.Tests.Services {
|
||||
|
||||
[TestFixture]
|
||||
public class ClockTests {
|
||||
[Test, Ignore("At the moment the default clock is using DateTime.Now until a user-time-zone corrected display is in effect.")]
|
||||
public void DefaultClockShouldComeFromSystemUtc() {
|
||||
IClock clock = new Clock();
|
||||
var before = DateTime.UtcNow;
|
||||
Thread.Sleep(2);
|
||||
var mark = clock.UtcNow;
|
||||
Thread.Sleep(2);
|
||||
var after = DateTime.UtcNow;
|
||||
|
||||
Assert.That(mark.Kind, Is.EqualTo(DateTimeKind.Utc));
|
||||
Assert.That(mark, Is.InRange(before, after));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void StubClockShouldComeFromSystemUtcAndDoesNotComeFromSystemTime() {
|
||||
var clock = new StubClock();
|
||||
|
Reference in New Issue
Block a user