Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class TestQueryExecutions : BaseTest {
public void TestBatchingBatch() {
string sql = "print 1 \nGO\nprint 2";
var site = Current.DB.Sites.First();
var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
var user = User.CreateUser("Fred", "a@a.com");
var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

Assert.AreEqual(0, results.ResultSets.Count());
Expand All @@ -27,7 +27,7 @@ public void TestBatchingBatch() {
public void TestMultiResultSetsInStatement() {
string sql = "select 1 select 2";
var site = Current.DB.Sites.First();
var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
var user = User.CreateUser("Fred", "a@a.com");
var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

Assert.AreEqual(2, results.ResultSets.Count());
Expand Down
27 changes: 4 additions & 23 deletions App/StackExchange.DataExplorer.Tests/Models/TestUser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,13 @@ namespace StackExchange.DataExplorer.Tests.Models {

[TestClass]
public class TestUser : BaseTest {

[TestMethod]
public void TestUserCreationSetsCreationDate() {
var u = User.CreateUser("Fred", "a@a.com", "xyz");
Assert.IsNotNull(u.CreationDate);
}

[TestMethod]
public void TestBasicUserCreation() {

User.CreateUser("Fred", "a@a.com", "xyz");

var u2 = Current.DB.Query<User>("select * from Users where Login = @Login", new {Login = "Fred"}).First();
Assert.AreEqual("Fred", u2.Login);

var o = Current.DB.Query<UserOpenId>("select * from UserOpenIds where OpenIdClaim = @claim", new {claim = "xyz"}).FirstOrDefault();
Assert.AreEqual("xyz", o.OpenIdClaim);
}

[TestMethod]
public void TestNoName() {

Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

var u1 = User.CreateUser("", null, "xyz");
var u2 = User.CreateUser(null, "", "xyz1");
var u1 = User.CreateUser("", null);
var u2 = User.CreateUser(null, "");

Assert.AreEqual("jon.doe", u1.Login);
// This behaviour is probably not what we want
Expand All @@ -49,13 +30,13 @@ public void TestNoSpaces() {

Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

var u1 = User.CreateUser("jon doe", null, "xyz");
var u1 = User.CreateUser("jon doe", null);
Assert.AreEqual("jon.doe", u1.Login);
}

[TestMethod]
public void TestWeirdChars() {
var u1 = User.CreateUser("jon&*doe", null, "xyz");
var u1 = User.CreateUser("jon&*doe", null);
Assert.AreEqual(u1.Login, "jondoe");
}
}
Expand Down
6 changes: 6 additions & 0 deletions App/StackExchange.DataExplorer/App_Start/BundleConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,15 @@ private static void RegisterBundles(BundleCollection bundles)
.Include("~/Content/homepage.css")
.Include("~/Content/topbar.css", new CssRewriteUrlTransform())
.Include("~/Content/header.css", new CssRewriteUrlTransform())
.Include("~/Content/user.css")
.Include("~/Content/jquery.autocomplete.css")
);

bundles.Add(new StyleBundle("~/assets/css/login")
.Include("~/Content/login.css", new CssRewriteUrlTransform())
.Include("~/Content/login-providers.css", new CssRewriteUrlTransform())
);

bundles.Add(new StyleBundle("~/assets/css/query")
.Include("~/Content/codemirror/codemirror.css")
.Include("~/Content/codemirror/custom.css")
Expand Down
8 changes: 4 additions & 4 deletions App/StackExchange.DataExplorer/Content/header.css
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,15 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
margin-bottom: 0;
}

#tabs {
.nav-tabs {
float: right;
}

.miniTabs {
margin-left: 5px;
}

#tabs a, .miniTabs a {
.nav-tabs a, .miniTabs a {
background:none repeat scroll 0 0 #fff;
border: 1px solid #fff;
color: #777;
Expand All @@ -152,7 +152,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
text-decoration: none;
}

#tabs a:hover, .miniTabs a:hover {
.nav-tabs a:hover, .miniTabs a:hover {
background: none repeat scroll 0 0 #FFFFFF;
border-color: #CCC #CCC #FFFFFF;
border-style: solid;
Expand All @@ -161,7 +161,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
margin-top: 9px;
}

#tabs a.youarehere, .miniTabs a.youarehere {
.nav-tabs a.youarehere, .miniTabs a.youarehere {
background: none repeat scroll 0 0 #FFFFFF;
border-color: #CCC #CCC #FFFFFF;
border-style: solid;
Expand Down
8 changes: 8 additions & 0 deletions App/StackExchange.DataExplorer/Content/login-providers.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.stackexchange { background-position: -356px 0; }
.google { background-position: -426px 0; }
.yahoo { background-position: 1px 4px; }
.livejournal { background-position: -73px 4px; }
.wordpress { background-position: -38px 4px; }
.blogger { background-position: -108px 4px; }
.verisign { background-position: -458px 4px; }
.aol { background-position: -142px 4px; }
104 changes: 104 additions & 0 deletions App/StackExchange.DataExplorer/Content/user.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
.user-profile .page > .subheader {
height: 40px;
}

.user-profile .page > .subheader .nav-tabs {
float: left;
}

.user-profile .page > .subheader .nav-tabs a,
.user-profile .page > .subheader .nav-tabs a.youarehere {
border: 0px;
font-size: 13px;
line-height: 1.3em;
height: auto;
padding: 11px 7px 12px 7px;
margin: 0 20px 0 0;
}

.user-profile .page > .subheader .nav-tabs a:hover {
color: #0C57A0;
border-bottom: 2px solid #0C57A0;
}

.user-profile .page > .subheader .nav-tabs a.youarehere {
font-weight: bold;
color: #0C57A0;
border-bottom: 2px solid #0C57A0;
}

.user-profile #add-login {
float: right;
font-weight: bold;
margin-top: -22px;
}

.user-profile #user-logins {
list-style-type: none;
margin: 0;
}

.user-profile .user-login {
margin-top: 14px;
margin-bottom: 20px;
padding-left: 24px;
}

.user-profile .user-login h2 {
font-size: 16px;
margin-left: -24px;
}

.user-profile .user-login span.icon {
background-image: url('./img/login-icons.svg');
background-repeat: no-repeat;
display: inline-block;
width: 16px;
height: 16px;
margin-bottom: -2px;
margin-right: 8px;
}

.user-profile .user-login .claim-identifier {
display: block;
margin-top: 5px;
color: #CCC;
}

.sectioned-nav {
float: left;
list-style-type: none;
margin: 0;
width: 220px;
}

.sectioned-nav li {
padding: 10px;
padding-right: 0;
}

.sectioned-nav li:hover {
background-color: #D8E8F7;
}

.sectioned-nav li a {
display: block;
color: #777;
padding: 4px;
}

.sectioned-nav li:hover a, .sectioned-nav li.youarehere a {
text-decoration: none;
border-right: 3px solid #0C57A0;
color: #0C57A0;
}

.sectioned-nav li.youarehere a {
font-weight: bold;
}

.sectioned-content {
margin-left: 220px;
padding-left: 50px;
padding-top: 10px;
}
Loading